Snap for 8709740 from 94136e97c59789b2242f8eee1cd8abde4fe323d4 to studio-dolphin-releasestudio-2021.3.1-betastudio-beta

Change-Id: I60acba3629ba543acf77426e415cd999c5252307

4430 files changed, 15564 insertions, 55728 deletions

diff --git a/.idea/anchors.xml b/.idea/anchors.xml
index 34eb7e99aa70..188d7ae7e91b 100644
--- a/.idea/anchors.xml
+++ b/.idea/anchors.xml
@@ -22,6 +22,7 @@
         <entry key="kotlinc.low-level-api-fir" value="kotlin.util.compiler-classpath" />
         <entry key="kotlinc.analysis-api-providers" value="kotlin.util.compiler-classpath" />
         <entry key="kotlinc.symbol-light-classes" value="kotlin.util.compiler-classpath" />
+        <entry key="kotlinc.kotlin-jps-common" value="kotlin.util.compiler-classpath" />
       </map>
     </option>
   </component>
diff --git a/.idea/libraries/kotlin_gradle_plugin.xml b/.idea/libraries/kotlin_gradle_plugin.xml
new file mode 100644
index 000000000000..e223f331b558
--- /dev/null
+++ b/.idea/libraries/kotlin_gradle_plugin.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlin.gradle.plugin" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.0/kotlin-gradle-plugin-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.0/kotlin-gradle-plugin-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlin_gradle_plugin_api.xml b/.idea/libraries/kotlin_gradle_plugin_api.xml
new file mode 100644
index 000000000000..63cf68788fbd
--- /dev/null
+++ b/.idea/libraries/kotlin_gradle_plugin_api.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlin.gradle.plugin.api" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.0/kotlin-gradle-plugin-api-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.0/kotlin-gradle-plugin-api-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlin_project_model.xml b/.idea/libraries/kotlin_project_model.xml
new file mode 100644
index 000000000000..d5d6d261574b
--- /dev/null
+++ b/.idea/libraries/kotlin_project_model.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlin.project.model" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-project-model:1.6.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-project-model/1.6.0/kotlin-project-model-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-project-model/1.6.0/kotlin-project-model-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlin_script_runtime.xml b/.idea/libraries/kotlin_script_runtime.xml
index 92086e2ee36a..94533bdce342 100644
--- a/.idea/libraries/kotlin_script_runtime.xml
+++ b/.idea/libraries/kotlin_script_runtime.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlin-script-runtime" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-script-runtime:1.6.21-release-for-android-studio" />
+    <properties maven-id="org.jetbrains.kotlin:kotlin-script-runtime:1.5.10" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.6.21-release-for-android-studio/kotlin-script-runtime-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.5.10/kotlin-script-runtime-1.5.10.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.6.21-release-for-android-studio/kotlin-script-runtime-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.5.10/kotlin-script-runtime-1.5.10-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
index f2375d961843..8ee4ae213359 100644
--- a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.allopen-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:allopen-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:allopen-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.6.21-release-for-android-studio/allopen-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.7.0-release-for-android-studio/allopen-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.6.21-release-for-android-studio/allopen-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.7.0-release-for-android-studio/allopen-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_analysis_api_providers.xml b/.idea/libraries/kotlinc_analysis_api_providers.xml
index 4b13773b9c4f..100c05f8f0cd 100644
--- a/.idea/libraries/kotlinc_analysis_api_providers.xml
+++ b/.idea/libraries/kotlinc_analysis_api_providers.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.analysis-api-providers" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-api-providers-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-api-providers-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.6.21-release-for-android-studio/analysis-api-providers-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.7.0-release-for-android-studio/analysis-api-providers-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.6.21-release-for-android-studio/analysis-api-providers-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.7.0-release-for-android-studio/analysis-api-providers-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_analysis_project_structure.xml b/.idea/libraries/kotlinc_analysis_project_structure.xml
index 30398f29c4d6..499d949f11be 100644
--- a/.idea/libraries/kotlinc_analysis_project_structure.xml
+++ b/.idea/libraries/kotlinc_analysis_project_structure.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.analysis-project-structure" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-project-structure-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-project-structure-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.6.21-release-for-android-studio/analysis-project-structure-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.7.0-release-for-android-studio/analysis-project-structure-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.6.21-release-for-android-studio/analysis-project-structure-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.7.0-release-for-android-studio/analysis-project-structure-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
index c570b9c9626f..0737e2813fd9 100644
--- a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.android-extensions-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:android-extensions-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:android-extensions-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.6.21-release-for-android-studio/android-extensions-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.7.0-release-for-android-studio/android-extensions-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.6.21-release-for-android-studio/android-extensions-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.7.0-release-for-android-studio/android-extensions-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_compiler_components_for_jps.xml b/.idea/libraries/kotlinc_compiler_components_for_jps.xml
index 8e5e6d25d007..671cc0868f94 100644
--- a/.idea/libraries/kotlinc_compiler_components_for_jps.xml
+++ b/.idea/libraries/kotlinc_compiler_components_for_jps.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.compiler-components-for-jps" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:compiler-components-for-jps:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:compiler-components-for-jps:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/compiler-components-for-jps/1.6.21-release-for-android-studio/compiler-components-for-jps-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/compiler-components-for-jps/1.7.0-release-for-android-studio/compiler-components-for-jps-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/compiler-components-for-jps/1.6.21-release-for-android-studio/compiler-components-for-jps-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/compiler-components-for-jps/1.7.0-release-for-android-studio/compiler-components-for-jps-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api.xml b/.idea/libraries/kotlinc_high_level_api.xml
index d6215d82d2b6..1c833c5a8682 100644
--- a/.idea/libraries/kotlinc_high_level_api.xml
+++ b/.idea/libraries/kotlinc_high_level_api.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.high-level-api" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.6.21-release-for-android-studio/high-level-api-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.7.0-release-for-android-studio/high-level-api-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.6.21-release-for-android-studio/high-level-api-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.7.0-release-for-android-studio/high-level-api-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_fir.xml b/.idea/libraries/kotlinc_high_level_api_fir.xml
index 755151084955..c8ed3add1edb 100644
--- a/.idea/libraries/kotlinc_high_level_api_fir.xml
+++ b/.idea/libraries/kotlinc_high_level_api_fir.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.high-level-api-fir" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.6.21-release-for-android-studio/high-level-api-fir-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.7.0-release-for-android-studio/high-level-api-fir-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.6.21-release-for-android-studio/high-level-api-fir-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.7.0-release-for-android-studio/high-level-api-fir-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
index c7ec6e1d2430..8ae93769a8d1 100644
--- a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
+++ b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.high-level-api-fir-tests" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-tests-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-tests-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.6.21-release-for-android-studio/high-level-api-fir-tests-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.7.0-release-for-android-studio/high-level-api-fir-tests-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.6.21-release-for-android-studio/high-level-api-fir-tests-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.7.0-release-for-android-studio/high-level-api-fir-tests-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base.xml b/.idea/libraries/kotlinc_high_level_api_impl_base.xml
index 903f882c4eb3..c7d852f62ca7 100644
--- a/.idea/libraries/kotlinc_high_level_api_impl_base.xml
+++ b/.idea/libraries/kotlinc_high_level_api_impl_base.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.high-level-api-impl-base" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.6.21-release-for-android-studio/high-level-api-impl-base-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.7.0-release-for-android-studio/high-level-api-impl-base-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.6.21-release-for-android-studio/high-level-api-impl-base-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.7.0-release-for-android-studio/high-level-api-impl-base-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
index 75faa6f4e773..af4bee41e4ab 100644
--- a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
+++ b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.high-level-api-impl-base-tests" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-tests-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-tests-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.6.21-release-for-android-studio/high-level-api-impl-base-tests-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.7.0-release-for-android-studio/high-level-api-impl-base-tests-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.6.21-release-for-android-studio/high-level-api-impl-base-tests-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.7.0-release-for-android-studio/high-level-api-impl-base-tests-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
index f141380c07d2..54360a231332 100644
--- a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
+++ b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.incremental-compilation-impl-tests" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:incremental-compilation-impl-tests-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:incremental-compilation-impl-tests-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.6.21-release-for-android-studio/incremental-compilation-impl-tests-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.7.0-release-for-android-studio/incremental-compilation-impl-tests-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.6.21-release-for-android-studio/incremental-compilation-impl-tests-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.7.0-release-for-android-studio/incremental-compilation-impl-tests-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
index 7656a9c93270..58c038a7f006 100644
--- a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
+++ b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-build-common-tests" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-build-common-tests-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-build-common-tests-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.6.21-release-for-android-studio/kotlin-build-common-tests-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.7.0-release-for-android-studio/kotlin-build-common-tests-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.6.21-release-for-android-studio/kotlin-build-common-tests-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.7.0-release-for-android-studio/kotlin-build-common-tests-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler.xml b/.idea/libraries/kotlinc_kotlin_compiler.xml
index a247dee4d5ab..90cf273320e5 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
index a577822e8875..2f4c49cd4b0a 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-cli" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-cli-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-cli-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-cli-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-cli-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-cli-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-cli-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_common.xml b/.idea/libraries/kotlinc_kotlin_compiler_common.xml
index 1e89d4dfef16..a8f4bf850c73 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_common.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_common.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-common" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-common-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-common-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-common-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-common-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
index 8c3b8f373da2..0070c66aae60 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-fe10" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fe10-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fe10-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-fe10-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-fe10-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
index 5c62a456b3c0..c9f9ead56b95 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-fir" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fir-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fir-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-fir-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-fir-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-fir-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-fir-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
index ba3da5c537f2..f1b9f40a71ff 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-ir" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-ir-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-ir-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-ir-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-ir-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_testdata.xml b/.idea/libraries/kotlinc_kotlin_compiler_testdata.xml
index d3cd27d129d5..0f27183bfc23 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_testdata.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_testdata.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-testdata" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-testdata-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-testdata-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-testdata-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-testdata-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-testdata-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-testdata-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
index e04eba943d8a..c89c5110b8ba 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-compiler-tests" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-tests-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-tests-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-tests-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-tests-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.6.21-release-for-android-studio/kotlin-compiler-tests-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.7.0-release-for-android-studio/kotlin-compiler-tests-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_dist.xml b/.idea/libraries/kotlinc_kotlin_dist.xml
index d24afb5bda85..9d8ed5df4ec6 100644
--- a/.idea/libraries/kotlinc_kotlin_dist.xml
+++ b/.idea/libraries/kotlinc_kotlin_dist.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-dist" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.6.21-release-for-android-studio/kotlin-dist-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.7.0-release-for-android-studio/kotlin-dist-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.6.21-release-for-android-studio/kotlin-dist-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.7.0-release-for-android-studio/kotlin-dist-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
index 39ac29b6292c..a82b7b96965e 100644
--- a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
+++ b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-gradle-statistics" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-statistics-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-statistics-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.6.21-release-for-android-studio/kotlin-gradle-statistics-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.7.0-release-for-android-studio/kotlin-gradle-statistics-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.6.21-release-for-android-studio/kotlin-gradle-statistics-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.7.0-release-for-android-studio/kotlin-gradle-statistics-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_jps_common.xml b/.idea/libraries/kotlinc_kotlin_jps_common.xml
new file mode 100644
index 000000000000..d8088db084ab
--- /dev/null
+++ b/.idea/libraries/kotlinc_kotlin_jps_common.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlinc.kotlin-jps-common" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-common-for-ide:1.7.0-release-for-android-studio" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.7.0-release-for-android-studio/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.7.0-release-for-android-studio/kotlin-jps-common-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
new file mode 100644
index 000000000000..fab29d7594d8
--- /dev/null
+++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlinc.kotlin-jps-plugin-classpath" type="repository">
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.7.0-release-for-android-studio" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.7.0-release-for-android-studio/kotlin-jps-plugin-classpath-1.7.0-release-for-android-studio.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.7.0-release-for-android-studio/kotlin-jps-plugin-classpath-1.7.0-release-for-android-studio-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_reflect.xml b/.idea/libraries/kotlinc_kotlin_reflect.xml
index b99cf2082e69..586ee5c499dd 100644
--- a/.idea/libraries/kotlinc_kotlin_reflect.xml
+++ b/.idea/libraries/kotlinc_kotlin_reflect.xml
@@ -1,16 +1,16 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-reflect" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.6.21-release-for-android-studio">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.7.0-release-for-android-studio">
       <exclude>
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
       </exclude>
     </properties>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.21-release-for-android-studio/kotlin-reflect-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.7.0-release-for-android-studio/kotlin-reflect-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.21-release-for-android-studio/kotlin-reflect-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.7.0-release-for-android-studio/kotlin-reflect-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_script_runtime.xml b/.idea/libraries/kotlinc_kotlin_script_runtime.xml
new file mode 100644
index 000000000000..34c4188675e6
--- /dev/null
+++ b/.idea/libraries/kotlinc_kotlin_script_runtime.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="kotlinc.kotlin-script-runtime" type="repository">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-script-runtime:1.7.0-release-for-android-studio" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0-release-for-android-studio/kotlin-script-runtime-1.7.0-release-for-android-studio.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0-release-for-android-studio/kotlin-script-runtime-1.7.0-release-for-android-studio-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_common.xml b/.idea/libraries/kotlinc_kotlin_scripting_common.xml
index be5969a1664e..5400c2b12e4f 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_common.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_common.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-scripting-common" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-common:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-common:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.6.21-release-for-android-studio/kotlin-scripting-common-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0-release-for-android-studio/kotlin-scripting-common-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.6.21-release-for-android-studio/kotlin-scripting-common-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0-release-for-android-studio/kotlin-scripting-common-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_compiler.xml b/.idea/libraries/kotlinc_kotlin_scripting_compiler.xml
index 5927b0b11c64..244e910bb4c7 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_compiler.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_compiler.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-scripting-compiler" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.6.21-release-for-android-studio/kotlin-scripting-compiler-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.7.0-release-for-android-studio/kotlin-scripting-compiler-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.6.21-release-for-android-studio/kotlin-scripting-compiler-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler/1.7.0-release-for-android-studio/kotlin-scripting-compiler-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
index 4922bd5a6e5e..c7b1762e2762 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-scripting-compiler-impl" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.6.21-release-for-android-studio/kotlin-scripting-compiler-impl-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.7.0-release-for-android-studio/kotlin-scripting-compiler-impl-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.6.21-release-for-android-studio/kotlin-scripting-compiler-impl-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.7.0-release-for-android-studio/kotlin-scripting-compiler-impl-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
index d7a2c4d0e3b5..7c93e664206b 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-scripting-jvm" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.21-release-for-android-studio/kotlin-scripting-jvm-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0-release-for-android-studio/kotlin-scripting-jvm-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.21-release-for-android-studio/kotlin-scripting-jvm-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0-release-for-android-studio/kotlin-scripting-jvm-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_stdlib.xml b/.idea/libraries/kotlinc_kotlin_stdlib.xml
index 6af4058cbb44..1270ed2d1b3d 100644
--- a/.idea/libraries/kotlinc_kotlin_stdlib.xml
+++ b/.idea/libraries/kotlinc_kotlin_stdlib.xml
@@ -1,6 +1,6 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-stdlib" type="repository">
-    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21-release-for-android-studio">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0-release-for-android-studio">
       <exclude>
         <dependency maven-id="org.jetbrains:annotations" />
       </exclude>
@@ -9,17 +9,17 @@
       <root url="file://$PROJECT_DIR$/lib/annotations/kotlin" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21-release-for-android-studio/kotlin-stdlib-jdk8-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.6.21-release-for-android-studio/kotlin-stdlib-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21-release-for-android-studio/kotlin-stdlib-common-1.6.21-release-for-android-studio.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21-release-for-android-studio/kotlin-stdlib-jdk7-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0-release-for-android-studio/kotlin-stdlib-jdk8-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0-release-for-android-studio/kotlin-stdlib-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0-release-for-android-studio/kotlin-stdlib-common-1.7.0-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0-release-for-android-studio/kotlin-stdlib-jdk7-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21-release-for-android-studio/kotlin-stdlib-jdk8-1.6.21-release-for-android-studio-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.6.21-release-for-android-studio/kotlin-stdlib-1.6.21-release-for-android-studio-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21-release-for-android-studio/kotlin-stdlib-common-1.6.21-release-for-android-studio-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21-release-for-android-studio/kotlin-stdlib-jdk7-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0-release-for-android-studio/kotlin-stdlib-jdk8-1.7.0-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.7.0-release-for-android-studio/kotlin-stdlib-1.7.0-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0-release-for-android-studio/kotlin-stdlib-common-1.7.0-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0-release-for-android-studio/kotlin-stdlib-jdk7-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml b/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
index f3b82db19177..2c962ad8aed9 100644
--- a/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
+++ b/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlin-stdlib-minimal-for-test" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.6.21-release-for-android-studio/kotlin-stdlib-minimal-for-test-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.7.0-release-for-android-studio/kotlin-stdlib-minimal-for-test-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.6.21-release-for-android-studio/kotlin-stdlib-minimal-for-test-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.7.0-release-for-android-studio/kotlin-stdlib-minimal-for-test-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
index 8c106d2c8f81..89a6c6bfdd8b 100644
--- a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.kotlinx-serialization-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlinx-serialization-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlinx-serialization-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.6.21-release-for-android-studio/kotlinx-serialization-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.7.0-release-for-android-studio/kotlinx-serialization-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.6.21-release-for-android-studio/kotlinx-serialization-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.7.0-release-for-android-studio/kotlinx-serialization-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
index 11d7ab77c760..e71617de11f8 100644
--- a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.lombok-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:lombok-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:lombok-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.6.21-release-for-android-studio/lombok-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.7.0-release-for-android-studio/lombok-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.6.21-release-for-android-studio/lombok-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.7.0-release-for-android-studio/lombok-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_low_level_api_fir.xml b/.idea/libraries/kotlinc_low_level_api_fir.xml
index 38f22346d850..377ed8201d99 100644
--- a/.idea/libraries/kotlinc_low_level_api_fir.xml
+++ b/.idea/libraries/kotlinc_low_level_api_fir.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.low-level-api-fir" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:low-level-api-fir-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:low-level-api-fir-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.6.21-release-for-android-studio/low-level-api-fir-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.7.0-release-for-android-studio/low-level-api-fir-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.6.21-release-for-android-studio/low-level-api-fir-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.7.0-release-for-android-studio/low-level-api-fir-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
index 556f79527d39..a992153fa21b 100644
--- a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.noarg-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:noarg-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:noarg-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.6.21-release-for-android-studio/noarg-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.7.0-release-for-android-studio/noarg-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.6.21-release-for-android-studio/noarg-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.7.0-release-for-android-studio/noarg-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
index 10f78cf0ff15..a40ddfb6b377 100644
--- a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.parcelize-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:parcelize-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:parcelize-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.6.21-release-for-android-studio/parcelize-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.7.0-release-for-android-studio/parcelize-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.6.21-release-for-android-studio/parcelize-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.7.0-release-for-android-studio/parcelize-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
index f76a8f92b5d8..9d1a47f05117 100644
--- a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.sam-with-receiver-compiler-plugin" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:sam-with-receiver-compiler-plugin-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:sam-with-receiver-compiler-plugin-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.6.21-release-for-android-studio/sam-with-receiver-compiler-plugin-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.7.0-release-for-android-studio/sam-with-receiver-compiler-plugin-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.6.21-release-for-android-studio/sam-with-receiver-compiler-plugin-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.7.0-release-for-android-studio/sam-with-receiver-compiler-plugin-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_symbol_light_classes.xml b/.idea/libraries/kotlinc_symbol_light_classes.xml
index 6b48c4684cda..b18204551f76 100644
--- a/.idea/libraries/kotlinc_symbol_light_classes.xml
+++ b/.idea/libraries/kotlinc_symbol_light_classes.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="kotlinc.symbol-light-classes" type="repository">
-    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:symbol-light-classes-for-ide:1.6.21-release-for-android-studio" />
+    <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:symbol-light-classes-for-ide:1.7.0-release-for-android-studio" />
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.6.21-release-for-android-studio/symbol-light-classes-for-ide-1.6.21-release-for-android-studio.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.7.0-release-for-android-studio/symbol-light-classes-for-ide-1.7.0-release-for-android-studio.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.6.21-release-for-android-studio/symbol-light-classes-for-ide-1.6.21-release-for-android-studio-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.7.0-release-for-android-studio/symbol-light-classes-for-ide-1.7.0-release-for-android-studio-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd5d60d4aba8..88c5ef142e11 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -965,6 +965,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml" filepath="$PROJECT_DIR$/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/frontend-independent/tests/kotlin.fir.frontend-independent.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/frontend-independent/tests/kotlin.fir.frontend-independent.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fe10-analyze/safe-analyze-utils/kotlin.fe10-analyze.safe-analyze-utils.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fe10-analyze/safe-analyze-utils/kotlin.fe10-analyze.safe-analyze-utils.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/formatter/kotlin.formatter.iml" filepath="$PROJECT_DIR$/plugins/kotlin/formatter/kotlin.formatter.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/generators/kotlin.generators.iml" filepath="$PROJECT_DIR$/plugins/kotlin/generators/kotlin.generators.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/git/kotlin.git.iml" filepath="$PROJECT_DIR$/plugins/kotlin/git/kotlin.git.iml" />
@@ -988,9 +989,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/j2k/old/kotlin.j2k.old.iml" filepath="$PROJECT_DIR$/plugins/kotlin/j2k/old/kotlin.j2k.old.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/j2k/old/tests/kotlin.j2k.old.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/j2k/services/kotlin.j2k.services.iml" filepath="$PROJECT_DIR$/plugins/kotlin/j2k/services/kotlin.j2k.services.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml" filepath="$PROJECT_DIR$/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/jps/jps-plugin/tests/kotlin.jps-plugin.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/jps/jps-plugin/tests/kotlin.jps-plugin.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/junit/kotlin.junit.iml" filepath="$PROJECT_DIR$/plugins/kotlin/junit/kotlin.junit.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/jvm/kotlin.jvm.iml" filepath="$PROJECT_DIR$/plugins/kotlin/jvm/kotlin.jvm.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml" filepath="$PROJECT_DIR$/plugins/kotlin/jvm-debugger/core/kotlin.jvm-debugger.core.iml" />
diff --git a/build.xml b/build.xml
index d12f9a8a5c1e..4e799da1ae7b 100644
--- a/build.xml
+++ b/build.xml
@@ -21,8 +21,9 @@
       <arg line="setupJdks setupKotlinCompiler"/>
     </exec>
     <propertyset id="intellij.build.properties">
-      <!-- Google: Allow passing the Kotlin plugin kind through Ant. -->
+      <!-- Google: Allow passing Kotlin plugin build properties through Ant. -->
       <propertyref name="kotlin.plugin.kind"/>
+      <propertyref name="jps.kotlin.home"/>
       <propertyref name="build.number"/>
       <propertyref name="compile.parallel"/>
       <propertyref name="compile.parallel.max.threads"/>
diff --git a/build/dependencies/gradle.properties b/build/dependencies/gradle.properties
index 868151f11561..a854ee356720 100644
--- a/build/dependencies/gradle.properties
+++ b/build/dependencies/gradle.properties
@@ -5,6 +5,6 @@ bundledMavenVersion=3.8.1
 gradleApiVersion=5.2.1
 jdkBuild=11_0_13b1751.25
 jetSignBuild=45.46
-kotlinCompilerBuild=211-1.5.31-release-551-IJ7442.40
+kotlinCompilerBuild=221-1.6.20-M1-release-207-IJ4713:Ideadev
 rkernelVersion=213.5
 zkmVersion=17.0.1
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.kt b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.kt
index c06b439b1910..afe268f0602f 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.kt
+++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.kt
@@ -104,9 +104,8 @@ class BuildProcessClasspathManager(parentDisposable: Disposable) {
       if (PluginManagerCore.isRunningFromSources()) {
         // ... try "out/classes/production/<module-name>", assuming that JAR name was automatically generated from module name
         val fileName = FileUtilRt.getNameWithoutExtension(PathUtil.getFileName(relativePath))
-        val moduleName = OLD_TO_NEW_MODULE_NAME[fileName] ?:
-                         //try restoring module name from JAR name automatically generated by BaseLayout.convertModuleNameToFileName
-                         ("intellij." + fileName.replace('-', '.'))
+        //try restoring module name from JAR name automatically generated by BaseLayout.convertModuleNameToFileName
+        val moduleName = "intellij." + fileName.replace('-', '.')
         var baseOutputDir = baseFile.parent
         if (baseOutputDir.fileName.toString() == "test") {
           baseOutputDir = baseOutputDir.parent.resolve("production")
@@ -206,13 +205,5 @@ class BuildProcessClasspathManager(parentDisposable: Disposable) {
     fun getLauncherClasspath(project: Project): List<String> {
       return BuildProcessParametersProvider.EP_NAME.getExtensions(project).flatMap { it.launcherClassPath }
     }
-
-    //todo[nik] this is a temporary compatibility fix; we should update plugin layout so JAR names correspond to module names instead.
-    @Suppress("SpellCheckingInspection")
-    private val OLD_TO_NEW_MODULE_NAME = hashMapOf(
-      "kotlin-jps-plugin" to "kotlin.jps-plugin",
-      "kotlin-jps-common" to "kotlin.jps-common",
-      "kotlin-common" to "kotlin.common",
-    )
   }
 }
\ No newline at end of file
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index 53dd12c84c47..3c9960bc8c32 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -752,7 +752,10 @@ final class CommunityLibraryLicenses {
     jetbrainsLibrary("kotlinc.kotlin-compiler-cli"),
     jetbrainsLibrary("kotlinc.kotlin-dist"),
     jetbrainsLibrary("kotlinc.kotlin-gradle-statistics"),
+    jetbrainsLibrary("kotlinc.kotlin-jps-common"),
+    jetbrainsLibrary("kotlinc.kotlin-jps-plugin-classpath"),
     jetbrainsLibrary("kotlinc.kotlin-reflect"),
+    jetbrainsLibrary("kotlinc.kotlin-script-runtime"),
     jetbrainsLibrary("kotlinc.kotlin-scripting-compiler"),
     jetbrainsLibrary("kotlinc.kotlin-stdlib"),
     jetbrainsLibrary("kotlinc.kotlinx-serialization-compiler-plugin"),
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.groovy
index 3bc30ca8830b..3c1444bf599d 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.groovy
@@ -40,7 +40,7 @@ final class KotlinBinaries {
     def kotlinPluginLibPath = "$compilerHome/lib"
     def kotlincLibPath = "$compilerHome/kotlinc/lib"
     if (new File(kotlinPluginLibPath).exists() && new File(kotlincLibPath).exists()) {
-      ["jps/kotlin-jps-plugin.jar", "kotlin-reflect.jar", "kotlin-common.jar"].each { String jarPath ->
+      ["jps/kotlin-jps-plugin.jar", "kotlin-common.jar"].each { String jarPath ->
         def completePath = "$kotlinPluginLibPath/$jarPath"
         if (!addToJpsClassPathIfExists(ant, completePath)) {
           throw new IllegalStateException("KotlinBinaries: '$completePath' doesn't exist")
@@ -56,7 +56,7 @@ final class KotlinBinaries {
           BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$jarFileName", ant)
         }
       }
-      ["kotlin-stdlib.jar"].each { String jarPath ->
+      ["kotlin-stdlib.jar", "kotlin-reflect.jar"].each { String jarPath ->
         def completePath = "$kotlincLibPath/$jarPath"
         if (!addToJpsClassPathIfExists(ant, completePath)) {
           throw new IllegalStateException("KotlinBinaries: '$completePath' doesn't exist")
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy
index 16f849cafad8..9361d3f7d915 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy
@@ -103,6 +103,7 @@ class KotlinPluginBuilder {
     "kotlin.uast.uast-kotlin-idea",
     "kotlin.i18n",
     "kotlin.project-model",
+    "kotlin.fe10-analyze.safe-analyze-utils"
   ]
   private static List<String> LIBRARIES = [
     "kotlinc.android-extensions-compiler-plugin",
@@ -111,7 +112,7 @@ class KotlinPluginBuilder {
     "kotlinc.sam-with-receiver-compiler-plugin",
     "kotlinc.kotlinx-serialization-compiler-plugin",
     "kotlinc.parcelize-compiler-plugin",
-    "kotlin-script-runtime",
+    "kotlinc.kotlin-script-runtime",
     "kotlinc.kotlin-scripting-compiler-impl",
     "kotlinc.kotlin-scripting-common",
     "kotlinc.kotlin-scripting-jvm",
@@ -212,9 +213,6 @@ class KotlinPluginBuilder {
         })
       }
 
-      String jpsPluginJar = "jps/kotlin-jps-plugin.jar"
-      withModule("kotlin.jps-plugin", jpsPluginJar)
-
       String kotlincKotlinCompilerCommon = "kotlinc.kotlin-compiler-common"
       withProjectLibrary(kotlincKotlinCompilerCommon, ProjectLibraryData.PackMode.STANDALONE_SEPARATE)
 
@@ -241,17 +239,35 @@ class KotlinPluginBuilder {
       withProjectLibrary("kotlinc.kotlin-compiler-fe10")
       withProjectLibrary("kotlinc.kotlin-compiler-ir")
 
-      withModule("kotlin.jps-common", "kotlin-jps-common.jar")
       withModule("kotlin.common", "kotlin-common.jar")
 
       withProjectLibrary("kotlinc.kotlin-reflect", ProjectLibraryData.PackMode.STANDALONE_MERGED)
       withProjectLibrary("kotlinc.kotlin-stdlib", ProjectLibraryData.PackMode.STANDALONE_MERGED)
+      withProjectLibrary("kotlinc.kotlin-jps-common")
       withProjectLibrary("javaslang")
       withProjectLibrary("kotlinx-collections-immutable-jvm")
       withProjectLibrary("javax-inject")
       withProjectLibrary("kotlinx-coroutines-jdk8")
       withProjectLibrary("completion-ranking-kotlin")
 
+      // in kt-213-master withProjectLibrary("kotlinc.kotlin-jps-plugin-classpath", "jps/kotlin-jps-plugin.jar") copying
+      // library to the jps/kotlin-jps-plugin.jar/kotlin-jps-plugin-classpath-dev-11.jar. This is a workaround
+      withGeneratedResources(new ResourcesGenerator() {
+        @Override
+        File generateResources(BuildContext context) {
+          def jpsPluginLib = "kotlinc.kotlin-jps-plugin-classpath"
+          JpsLibrary library = context.project.libraryCollection.findLibrary(jpsPluginLib)
+          List<File> jars = library.getFiles(JpsOrderRootType.COMPILED)
+          if (jars.size() != 1) {
+            throw new IllegalStateException("$jpsPluginLib is expected to have only one jar")
+          }
+          def result = context.paths.tempDir.resolve("kotlin-jps-plugin.jar")
+
+          Files.copy(jars[0].toPath(), result.toAbsolutePath())
+          result.toFile()
+        }
+      }, "lib/jps")
+
       withGeneratedResources(new ResourcesGenerator() {
         @Override
         File generateResources(BuildContext context) {
diff --git a/platform/util-ex/src/com/intellij/openapi/progress/coroutines.kt b/platform/util-ex/src/com/intellij/openapi/progress/coroutines.kt
index 6c192b872526..61913c3e2f56 100644
--- a/platform/util-ex/src/com/intellij/openapi/progress/coroutines.kt
+++ b/platform/util-ex/src/com/intellij/openapi/progress/coroutines.kt
@@ -97,8 +97,7 @@ suspend fun <T> runUnderIndicator(action: () -> T): T {
   return runUnderIndicator(ctx.job, ctx.progressSink, action)
 }
 
-@Internal
-@Suppress("EXPERIMENTAL_API_USAGE_ERROR")
+@OptIn(InternalCoroutinesApi::class)
 fun <T> runUnderIndicator(job: Job, progressSink: ProgressSink?, action: () -> T): T {
   job.ensureActive()
   val indicator = if (progressSink == null) EmptyProgressIndicator() else ProgressSinkIndicator(progressSink)
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml b/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml
index 09a52decab5f..6051902199e1 100644
--- a/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/kotlin.fir.analysis-api-providers-ide-impl.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -58,5 +59,6 @@
     <orderEntry type="library" name="kotlinc.analysis-api-providers" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.analysis-project-structure-ide-impl" />
     <orderEntry type="library" name="kotlinc.analysis-project-structure" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-fir" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/src/org/jetbrains/kotlin/analysis/providers/ide/KotlinIdeAnnotationsResolver.kt b/plugins/kotlin/analysis-api-providers-ide-impl/src/org/jetbrains/kotlin/analysis/providers/ide/KotlinIdeAnnotationsResolver.kt
new file mode 100644
index 000000000000..bc65edc96e6e
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/src/org/jetbrains/kotlin/analysis/providers/ide/KotlinIdeAnnotationsResolver.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package org.jetbrains.kotlin.analysis.providers.ide
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolver
+import org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolverFactory
+import org.jetbrains.kotlin.idea.stubindex.KotlinAnnotationsIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
+import org.jetbrains.kotlin.name.ClassId
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.*
+
+internal class KotlinIdeAnnotationsResolverFactory(private val project: Project) : KotlinAnnotationsResolverFactory {
+    override fun createAnnotationResolver(searchScope: GlobalSearchScope): KotlinAnnotationsResolver {
+        return KotlinIdeAnnotationsResolver(project, searchScope)
+    }
+}
+
+/**
+ * IDE-mode implementation for [KotlinAnnotationsResolver].
+ *
+ * Uses indices and PSI as a way to "resolve" the annotations, so it might not be 100% accurate.
+ *
+ * @param searchScope A scope in which [KotlinIdeAnnotationsResolver] will operate.
+ */
+private class KotlinIdeAnnotationsResolver(
+    private val project: Project,
+    private val searchScope: GlobalSearchScope,
+) : KotlinAnnotationsResolver {
+
+    override fun declarationsByAnnotation(queriedAnnotation: ClassId): Set<KtAnnotated> {
+        require(!queriedAnnotation.isLocal && !queriedAnnotation.isNestedClass) {
+            "Queried annotation must be top-level, but was $queriedAnnotation"
+        }
+
+        val annotationsIndex = KotlinAnnotationsIndex.getInstance()
+        val annotationEntries = annotationsIndex[queriedAnnotation.shortClassName.asString(), project, searchScope]
+
+        return annotationEntries.asSequence()
+            .filter { it.resolveAnnotationId() == queriedAnnotation }
+            .mapNotNull { it.annotatedDeclaration }
+            .filter { it is KtFile || it is KtDeclaration }
+            .toSet()
+    }
+
+    override fun annotationsOnDeclaration(declaration: KtAnnotated): Set<ClassId> {
+        val annotationEntries = when (declaration) {
+            is KtFile -> declaration.annotationEntries
+            is KtDeclaration -> declaration.annotationEntries
+            else -> error("Unexpected element of class ${declaration::class}")
+        }
+
+        return annotationEntries.mapNotNull { it.resolveAnnotationId() }.toSet()
+    }
+
+    /**
+     * Examples of usage:
+     *
+     * - `Baz` -> `FqName("Baz")`
+     * - `Bar.Baz` -> `FqName("Bar.Baz")`
+     * - `foo.bar.Baz<A, B>` -> `FqName("foo.bar.Baz")`
+     */
+    private fun KtUserType.referencedFqName(): FqName? {
+        val allTypes = generateSequence(this) { it.qualifier }.toList().asReversed()
+        val allQualifiers = allTypes.map { it.referencedName ?: return null }
+
+        return FqName.fromSegments(allQualifiers)
+    }
+
+    private fun KtAnnotationEntry.resolveAnnotationId(): ClassId? {
+        return resolveAnnotationFqName()?.let { ClassId.topLevel(it) }
+    }
+
+    private fun KtAnnotationEntry.resolveAnnotationFqName(): FqName? {
+        val annotationTypeElement = typeReference?.typeElement as? KtUserType
+        val referencedName = annotationTypeElement?.referencedFqName() ?: return null
+
+        // FIXME what happens with aliased imports? They are correctly reported by the annotation index
+        if (referencedName.isRoot) return null
+
+        if (!referencedName.parent().isRoot) {
+            // we assume here that the annotation is used by its fully-qualified name
+            return referencedName.takeIf { annotationActuallyExists(it) }
+        }
+
+        val candidates = getCandidatesFromImports(containingKtFile, referencedName.shortName())
+
+        return candidates.fromExplicitImports.resolveToSingleName()
+            ?: candidates.fromSamePackage.resolveToSingleName()
+            ?: candidates.fromStarImports.resolveToSingleName()
+    }
+
+    /**
+     * A set of places where the annotation can be possibly resolved.
+     *
+     * @param fromSamePackage A possible candidate from the same package. It is a single name, but it is wrapped into a set for consistency.
+     * @param fromExplicitImports Candidates from the explicit, fully-qualified imports with matching short name.
+     * @param fromStarImports Candidates from all star imports in the file; it is possible that the annotation goes from one of them.
+     */
+    private data class ResolveByImportsCandidates(
+        val fromSamePackage: Set<FqName>,
+        val fromExplicitImports: Set<FqName>,
+        val fromStarImports: Set<FqName>,
+    )
+
+    private fun getCandidatesFromImports(
+        file: KtFile,
+        targetName: Name,
+    ): ResolveByImportsCandidates {
+
+        val starImports = mutableSetOf<FqName>()
+        val explicitImports = mutableSetOf<FqName>()
+
+        for (import in file.importDirectives) {
+            val importedName = import.importedFqName ?: continue
+
+            if (import.isAllUnder) {
+                starImports += importedName.child(targetName)
+            } else if (importedName.shortName() == targetName) {
+                explicitImports += importedName
+            }
+        }
+
+        val packageImport = file.packageFqName.child(targetName)
+
+        return ResolveByImportsCandidates(setOf(packageImport), explicitImports, starImports)
+    }
+
+    private fun Set<FqName>.resolveToSingleName(): FqName? = singleOrNull { annotationActuallyExists(it) }
+
+    private fun annotationActuallyExists(matchingImport: FqName): Boolean {
+        val foundClasses = KotlinFullClassNameIndex.getInstance()[matchingImport.asString(), project, searchScope]
+        return foundClasses.singleOrNull { it.isAnnotation() && it.isTopLevel() } != null
+    }
+}
+
+/**
+ * A declaration which is annotated with passed [KtAnnotationEntry].
+ */
+private val KtAnnotationEntry.annotatedDeclaration: KtAnnotated?
+    get() {
+        val modifierListEntry = this.parent as? KtAnnotation ?: this
+        val modifierList = modifierListEntry.parent as? KtModifierList
+
+        return modifierList?.parent as? KtAnnotated
+    }
+
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/AbstractKotlinIdeAnnotationsResolverTest.kt b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/AbstractKotlinIdeAnnotationsResolverTest.kt
new file mode 100644
index 000000000000..e247ae9e3125
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/AbstractKotlinIdeAnnotationsResolverTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package org.jetbrains.kotlin.idea.fir.analysis.providers
+
+import com.intellij.openapi.components.service
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.util.parentOfType
+import org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolver
+import org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolverFactory
+import org.jetbrains.kotlin.idea.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.psi.KtAnnotated
+import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
+import java.io.File
+
+abstract class AbstractKotlinIdeAnnotationsResolverTest : KotlinLightCodeInsightFixtureTestCase() {
+    private val expectedAnnotationsDirective: String = "// ANNOTATION:"
+
+    private val annotationsResolver: KotlinAnnotationsResolver
+        get() = project.service<KotlinAnnotationsResolverFactory>().createAnnotationResolver(GlobalSearchScope.projectScope(project))
+
+    fun doTest(path: String) {
+        val mainTestFile = File(path)
+        val allTestFiles = listOf(mainTestFile) + resolveDependencyFiles(mainTestFile)
+
+        myFixture.configureByFiles(*allTestFiles.toTypedArray())
+
+        val annotatedElement = myFixture.elementAtCaret.parentOfType<KtAnnotated>(withSelf = true)
+            ?: error("Expected KtAnnotation element at the caret: ${myFixture.elementAtCaret.getElementTextWithContext()}")
+
+        val actualAnnotations = annotationsResolver.annotationsOnDeclaration(annotatedElement).sortedBy { it.toString() }
+        val expectedAnnotations = InTextDirectivesUtils.findListWithPrefixes(
+            myFixture.editor.document.text,
+            expectedAnnotationsDirective
+        ).filter { it.isNotEmpty() }
+
+        assertEquals(
+            "Expected annotations not found on the element under the caret:",
+            expectedAnnotations,
+            actualAnnotations.map { it.toString() }
+        )
+    }
+
+    private fun resolveDependencyFiles(mainFile: File): List<File> {
+        val dependencySuffixes = listOf(".dependency.kt", ".dependency1.kt", ".dependency2.kt")
+
+        return dependencySuffixes
+            .map { suffix -> mainFile.resolveSiblingWithDifferentExtension(suffix) }
+            .filter { it.exists() }
+    }
+
+    private fun File.resolveSiblingWithDifferentExtension(newExtension: String): File =
+        resolveSibling("$nameWithoutExtension$newExtension")
+}
+
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/KotlinIdeAnnotationsResolverTestGenerated.java b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/KotlinIdeAnnotationsResolverTestGenerated.java
new file mode 100644
index 000000000000..dc07f1a93437
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/KotlinIdeAnnotationsResolverTestGenerated.java
@@ -0,0 +1,96 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.fir.analysis.providers;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.jetbrains.kotlin.idea.test.TestRoot;
+import org.junit.runner.RunWith;
+
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
+ * DO NOT MODIFY MANUALLY.
+ */
+@SuppressWarnings("all")
+@TestRoot("analysis-api-providers-ide-impl")
+@TestDataPath("$CONTENT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+@TestMetadata("testData/annotationsResolver")
+public class KotlinIdeAnnotationsResolverTestGenerated extends AbstractKotlinIdeAnnotationsResolverTest {
+    private void runTest(String testDataFilePath) throws Exception {
+        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+    }
+
+    @TestMetadata("annotations_in_brackets_syntax.kt")
+    public void testAnnotations_in_brackets_syntax() throws Exception {
+        runTest("testData/annotationsResolver/annotations_in_brackets_syntax.kt");
+    }
+
+    @TestMetadata("different_package_fqname.kt")
+    public void testDifferent_package_fqname() throws Exception {
+        runTest("testData/annotationsResolver/different_package_fqname.kt");
+    }
+
+    @TestMetadata("different_package_short_name_full_import.kt")
+    public void testDifferent_package_short_name_full_import() throws Exception {
+        runTest("testData/annotationsResolver/different_package_short_name_full_import.kt");
+    }
+
+    @TestMetadata("different_package_short_name_no_import.kt")
+    public void testDifferent_package_short_name_no_import() throws Exception {
+        runTest("testData/annotationsResolver/different_package_short_name_no_import.kt");
+    }
+
+    @TestMetadata("different_package_short_name_star_import.kt")
+    public void testDifferent_package_short_name_star_import() throws Exception {
+        runTest("testData/annotationsResolver/different_package_short_name_star_import.kt");
+    }
+
+    @TestMetadata("same_package_fqname.kt")
+    public void testSame_package_fqname() throws Exception {
+        runTest("testData/annotationsResolver/same_package_fqname.kt");
+    }
+
+    @TestMetadata("same_package_short_name.kt")
+    public void testSame_package_short_name() throws Exception {
+        runTest("testData/annotationsResolver/same_package_short_name.kt");
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/annotationsResolver/ambiguity")
+    public static class Ambiguity extends AbstractKotlinIdeAnnotationsResolverTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("full_import_different_packages.kt")
+        public void testFull_import_different_packages() throws Exception {
+            runTest("testData/annotationsResolver/ambiguity/full_import_different_packages.kt");
+        }
+
+        @TestMetadata("star_import_different_packages.kt")
+        public void testStar_import_different_packages() throws Exception {
+            runTest("testData/annotationsResolver/ambiguity/star_import_different_packages.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/annotationsResolver/priority")
+    public static class Priority extends AbstractKotlinIdeAnnotationsResolverTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("full_import_beats_star_import.kt")
+        public void testFull_import_beats_star_import() throws Exception {
+            runTest("testData/annotationsResolver/priority/full_import_beats_star_import.kt");
+        }
+
+        @TestMetadata("star_import_beats_package_import.kt")
+        public void testStar_import_beats_package_import() throws Exception {
+            runTest("testData/annotationsResolver/priority/star_import_beats_package_import.kt");
+        }
+    }
+}
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/AbstractSessionsInvalidationTest.kt b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/AbstractSessionsInvalidationTest.kt
index a77e2dc86d2d..50f65b833758 100644
--- a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/AbstractSessionsInvalidationTest.kt
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/AbstractSessionsInvalidationTest.kt
@@ -7,9 +7,9 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.testFramework.PsiTestUtil
 import junit.framework.Assert
-import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeModuleSession
-import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
-import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProviderStorage
+import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirModuleSession
+import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
+import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProviderStorage
 import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
 import org.jetbrains.kotlin.idea.fir.analysis.project.structure.getMainKtSourceModule
 import org.jetbrains.kotlin.idea.fir.analysis.providers.TestProjectModule
@@ -50,7 +50,7 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
 
         val rootModuleSourceInfo = rootModule.getMainKtSourceModule()!!
 
-        val storage = FirIdeSessionProviderStorage(project)
+        val storage = LLFirSessionProviderStorage(project)
 
         val initialSessions = storage.getFirSessions(rootModuleSourceInfo)
         modulesToMakeOOBM.forEach { it.incModificationTracker() }
@@ -62,7 +62,7 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
         changedSessions.removeAll(intersection)
         val changedSessionsModulesNamesSorted = changedSessions
             .map { session ->
-                val moduleSession = session as FirIdeModuleSession
+                val moduleSession = session as LLFirModuleSession
                 val module = moduleSession.module as KtSourceModule
                 module.moduleName
             }
@@ -72,9 +72,9 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
         Assert.assertEquals(testStructure.expectedInvalidatedModules, changedSessionsModulesNamesSorted)
     }
 
-    private fun FirIdeSessionProviderStorage.getFirSessions(module: KtSourceModule): Set<FirIdeSession> {
+    private fun LLFirSessionProviderStorage.getFirSessions(module: KtSourceModule): Set<LLFirSession> {
         val sessionProvider = getSessionProvider(module)
-        return sessionProvider.sessions.values.toSet()
+        return sessionProvider.allSessions.toSet()
     }
 
     private fun createEmptyModule(name: String): Module {
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/SessionsInvalidationTestGenerated.java b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/SessionsInvalidationTestGenerated.java
index be7bc209a9ed..416e8403b734 100644
--- a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/SessionsInvalidationTestGenerated.java
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/sessions/SessionsInvalidationTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.analysis.providers.sessions;
 
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/trackers/ProjectWideOutOfBlockKotlinModificationTrackerTestGenerated.java b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/trackers/ProjectWideOutOfBlockKotlinModificationTrackerTestGenerated.java
index 53a48c4de6b8..0455c30fddd3 100644
--- a/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/trackers/ProjectWideOutOfBlockKotlinModificationTrackerTestGenerated.java
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/test/org/jetbrains/kotlin/idea/fir/analysis/providers/trackers/ProjectWideOutOfBlockKotlinModificationTrackerTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.analysis.providers.trackers;
 
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency1.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency1.kt
new file mode 100644
index 000000000000..fd14991a4d6f
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency1.kt
@@ -0,0 +1,3 @@
+package dependency.one
+
+annotation class MyAnnotation
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency2.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency2.kt
new file mode 100644
index 000000000000..0a74348ba3ae
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.dependency2.kt
@@ -0,0 +1,3 @@
+package dependency.two
+
+annotation class MyAnnotation
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.kt
new file mode 100644
index 000000000000..1aadd5302189
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/full_import_different_packages.kt
@@ -0,0 +1,9 @@
+package test
+
+import dependency.one.*
+import dependency.two.*
+
+@MyAnnotation
+fun test<caret>() {}
+
+// ANNOTATION:
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency1.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency1.kt
new file mode 100644
index 000000000000..fd14991a4d6f
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency1.kt
@@ -0,0 +1,3 @@
+package dependency.one
+
+annotation class MyAnnotation
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency2.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency2.kt
new file mode 100644
index 000000000000..0a74348ba3ae
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.dependency2.kt
@@ -0,0 +1,3 @@
+package dependency.two
+
+annotation class MyAnnotation
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.kt
new file mode 100644
index 000000000000..2f9bd16113ca
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/ambiguity/star_import_different_packages.kt
@@ -0,0 +1,9 @@
+package test
+
+import dependency.one.MyAnnotation
+import dependency.two.MyAnnotation
+
+@MyAnnotation
+fun test<caret>() {}
+
+// ANNOTATION:
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/annotations_in_brackets_syntax.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/annotations_in_brackets_syntax.kt
new file mode 100644
index 000000000000..c4218cca1229
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/annotations_in_brackets_syntax.kt
@@ -0,0 +1,13 @@
+package foo.bar.baz
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
+
+@[Ann1]
+@[Ann2 Ann2]
+fun test<caret>() {}
+
+// ANNOTATION: foo/bar/baz/Ann1, foo/bar/baz/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.dependency.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.dependency.kt
new file mode 100644
index 000000000000..5a0ba7030b67
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.dependency.kt
@@ -0,0 +1,7 @@
+package dependency
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.kt
new file mode 100644
index 000000000000..0e1a7fa97000
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_fqname.kt
@@ -0,0 +1,7 @@
+package foo.bar.baz
+
+@dependency.Ann1
+@dependency.Ann2
+fun test<caret>() {}
+
+// ANNOTATION: dependency/Ann1, dependency/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.dependency.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.dependency.kt
new file mode 100644
index 000000000000..5a0ba7030b67
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.dependency.kt
@@ -0,0 +1,7 @@
+package dependency
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.kt
new file mode 100644
index 000000000000..6596104784e9
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_full_import.kt
@@ -0,0 +1,10 @@
+package foo.bar.baz
+
+import dependency.Ann1
+import dependency.Ann2
+
+@Ann1
+@Ann2
+fun test<caret>() {}
+
+// ANNOTATION: dependency/Ann1, dependency/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.dependency.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.dependency.kt
new file mode 100644
index 000000000000..5a0ba7030b67
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.dependency.kt
@@ -0,0 +1,7 @@
+package dependency
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.kt
new file mode 100644
index 000000000000..022dcab36b8a
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_no_import.kt
@@ -0,0 +1,7 @@
+package foo.bar.baz
+
+@Ann1
+@Ann2
+fun test<caret>() {}
+
+// ANNOTATION:
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.dependency.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.dependency.kt
new file mode 100644
index 000000000000..5a0ba7030b67
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.dependency.kt
@@ -0,0 +1,7 @@
+package dependency
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.kt
new file mode 100644
index 000000000000..22fabc9c455b
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/different_package_short_name_star_import.kt
@@ -0,0 +1,9 @@
+package foo.bar.baz
+
+import dependency.*
+
+@Ann1
+@Ann2
+fun test<caret>() {}
+
+// ANNOTATION: dependency/Ann1, dependency/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency1.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency1.kt
new file mode 100644
index 000000000000..4e36f1020faf
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency1.kt
@@ -0,0 +1,3 @@
+package dependency.one
+
+annotation class MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency2.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency2.kt
new file mode 100644
index 000000000000..d7ac1ff616d8
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.dependency2.kt
@@ -0,0 +1,3 @@
+package dependency.two
+
+annotation class MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.kt
new file mode 100644
index 000000000000..2ab1125bede4
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/full_import_beats_star_import.kt
@@ -0,0 +1,9 @@
+package test
+
+import dependency.one.MyAnnotation
+import dependency.two.*
+
+@MyAnnotation
+fun test<caret>() {}
+
+// ANNOTATION: dependency/one/MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency1.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency1.kt
new file mode 100644
index 000000000000..a36f63a71689
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency1.kt
@@ -0,0 +1,3 @@
+package test
+
+annotation class MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency2.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency2.kt
new file mode 100644
index 000000000000..abe85406b6e7
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.dependency2.kt
@@ -0,0 +1,3 @@
+package dependency
+
+annotation class MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.kt
new file mode 100644
index 000000000000..b9ca8d425591
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/priority/star_import_beats_package_import.kt
@@ -0,0 +1,8 @@
+package test
+
+import dependency.MyAnnotation
+
+@MyAnnotation
+fun test<caret>() {}
+
+// ANNOTATION: dependency/MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_fqname.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_fqname.kt
new file mode 100644
index 000000000000..802e406dcd5c
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_fqname.kt
@@ -0,0 +1,13 @@
+package foo.bar.baz
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
+
+@foo.bar.baz.Ann1
+@foo.bar.baz.Ann2
+fun test<caret>() {}
+
+// ANNOTATION: foo/bar/baz/Ann1, foo/bar/baz/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_short_name.kt b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_short_name.kt
new file mode 100644
index 000000000000..89557308b3e3
--- /dev/null
+++ b/plugins/kotlin/analysis-api-providers-ide-impl/testData/annotationsResolver/same_package_short_name.kt
@@ -0,0 +1,13 @@
+package foo.bar.baz
+
+annotation class Ann1
+
+annotation class Ann2
+
+annotation class Ann3
+
+@Ann1
+@Ann2
+fun test<caret>() {}
+
+// ANNOTATION: foo/bar/baz/Ann1, foo/bar/baz/Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
index 085c1102eff5..04d888710f57 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/caches/resolve/IdePlatformKindResolution.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.TargetEnvironment
 import org.jetbrains.kotlin.storage.StorageManager
 
 interface IdePlatformKindResolution {
-    val kind: IdePlatformKind<*>
+    val kind: IdePlatformKind
 
     fun getKeyForBuiltIns(moduleInfo: ModuleInfo, sdkInfo: SdkInfo?, stdlibInfo: LibraryInfo?): BuiltInsCacheKey
     fun createBuiltIns(
@@ -75,11 +75,11 @@ interface IdePlatformKindResolution {
             groupedResolution
         }
 
-        fun getResolution(kind: IdePlatformKind<*>): IdePlatformKindResolution {
+        fun getResolution(kind: IdePlatformKind): IdePlatformKindResolution {
             return CACHED_RESOLUTION_SUPPORT[kind] ?: error("Unknown platform $this")
         }
     }
 }
 
-val IdePlatformKind<*>.resolution: IdePlatformKindResolution
+val IdePlatformKind.resolution: IdePlatformKindResolution
     get() = IdePlatformKindResolution.getResolution(this)
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/config/KotlinFacetSettingsProvider.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/config/KotlinFacetSettingsProvider.kt
new file mode 100644
index 000000000000..742a9704ecf3
--- /dev/null
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/config/KotlinFacetSettingsProvider.kt
@@ -0,0 +1,15 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.config
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
+
+interface KotlinFacetSettingsProvider {
+    fun getSettings(module: Module): KotlinFacetSettings?
+    fun getInitializedSettings(module: Module): KotlinFacetSettings
+
+    companion object {
+        fun getInstance(project: Project): KotlinFacetSettingsProvider? = project.takeUnless(Project::isDisposed)
+            ?.getService(KotlinFacetSettingsProvider::class.java)
+    }
+}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt
deleted file mode 100644
index a6b1df810ee2..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/FileAttributeService.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches
-
-import com.intellij.openapi.vfs.VirtualFile
-import java.io.DataInput
-import java.io.DataOutput
-
-data class CachedAttributeData<out T>(val value: T, val timeStamp: Long)
-
-interface FileAttributeService {
-    fun register(id: String, version: Int, fixedSize: Boolean = true) {}
-
-    fun <T : Enum<T>> writeEnumAttribute(id: String, file: VirtualFile, value: T): CachedAttributeData<T> =
-        CachedAttributeData(value, timeStamp = file.timeStamp)
-
-    fun <T : Enum<T>> readEnumAttribute(id: String, file: VirtualFile, klass: Class<T>): CachedAttributeData<T>? = null
-
-    fun writeBooleanAttribute(id: String, file: VirtualFile, value: Boolean): CachedAttributeData<Boolean> =
-        CachedAttributeData(value, timeStamp = file.timeStamp)
-
-    fun readBooleanAttribute(id: String, file: VirtualFile): CachedAttributeData<Boolean>? = null
-
-    fun <T> write(file: VirtualFile, id: String, value: T, writeValueFun: (DataOutput, T) -> Unit): CachedAttributeData<T>
-
-    fun <T> read(file: VirtualFile, id: String, readValueFun: (DataInput) -> T): CachedAttributeData<T>?
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
deleted file mode 100644
index 5fc9f3598adc..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/IDEKotlinBinaryClassCache.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches
-
-import com.intellij.ide.highlighter.JavaClassFileType
-import com.intellij.openapi.components.service
-import com.intellij.openapi.util.Key
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.VirtualFileWithId
-import com.intellij.reference.SoftReference
-import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import org.jetbrains.kotlin.name.ClassId
-
-class IDEKotlinBinaryClassCache {
-    class KotlinBinaryClassHeaderData(
-        val classId: ClassId,
-        val kind: KotlinClassHeader.Kind,
-        val metadataVersion: JvmMetadataVersion,
-        val partNamesIfMultifileFacade: List<String>,
-        val packageName: String?
-    )
-
-    data class KotlinBinaryData(val isKotlinBinary: Boolean, val timestamp: Long, val headerData: KotlinBinaryClassHeaderData?)
-
-    /**
-     * Checks if this file is a compiled Kotlin class file (not necessarily ABI-compatible with the current plugin)
-     */
-    fun isKotlinJvmCompiledFile(file: VirtualFile, fileContent: ByteArray? = null): Boolean {
-        if (file.extension != JavaClassFileType.INSTANCE!!.defaultExtension) {
-            return false
-        }
-
-        getKotlinBinaryFromCache(file)?.let {
-            return it.isKotlinBinary
-        }
-        return kotlinJvmBinaryClass(file, fileContent) != null
-    }
-
-    fun getKotlinBinaryClass(file: VirtualFile, fileContent: ByteArray? = null): KotlinJvmBinaryClass? {
-        val cached = getKotlinBinaryFromCache(file)
-        if (cached != null && !cached.isKotlinBinary) {
-            return null
-        }
-
-        return kotlinJvmBinaryClass(file, fileContent)
-    }
-
-    private fun kotlinJvmBinaryClass(
-        file: VirtualFile,
-        fileContent: ByteArray?
-    ): KotlinJvmBinaryClass? {
-        val kotlinBinaryClass = KotlinBinaryClassCache.getKotlinBinaryClassOrClassFileContent(file, fileContent)?.toKotlinJvmBinaryClass()
-
-        val isKotlinBinaryClass = kotlinBinaryClass != null
-        if (file is VirtualFileWithId) {
-            attributeService.writeBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file, isKotlinBinaryClass)
-        }
-
-        if (isKotlinBinaryClass) {
-            val headerInfo = createHeaderInfo(kotlinBinaryClass!!)
-            file.putUserData(KOTLIN_BINARY_DATA_KEY, SoftReference(KotlinBinaryData(isKotlinBinaryClass, file.timeStamp, headerInfo)))
-        }
-
-        return kotlinBinaryClass
-    }
-
-    fun getKotlinBinaryClassHeaderData(file: VirtualFile, fileContent: ByteArray? = null): KotlinBinaryClassHeaderData? {
-        getKotlinBinaryFromCache(file)?.let { cached ->
-            if (!cached.isKotlinBinary) {
-                return null
-            }
-            if (cached.headerData != null) {
-                return cached.headerData
-            }
-        }
-
-        val kotlinBinaryClass = kotlinJvmBinaryClass(file, fileContent) ?: return null
-        return createHeaderInfo(kotlinBinaryClass)
-    }
-
-    private val attributeService = service<FileAttributeService>()
-
-    private fun createHeaderInfo(kotlinBinaryClass: KotlinJvmBinaryClass): KotlinBinaryClassHeaderData {
-        val classId = kotlinBinaryClass.classId
-
-        return kotlinBinaryClass.classHeader.toLightHeader(classId)
-    }
-
-    private fun KotlinClassHeader.toLightHeader(classId: ClassId) =
-        KotlinBinaryClassHeaderData(
-            classId, kind, metadataVersion, multifilePartNames, packageName
-        )
-
-    private val KOTLIN_IS_COMPILED_FILE_ATTRIBUTE: String = "kotlin-is-binary-compiled".apply {
-        service<FileAttributeService>().register(this, 2)
-    }
-
-    private val KOTLIN_BINARY_DATA_KEY = Key.create<SoftReference<KotlinBinaryData>>(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE)
-
-    private fun getKotlinBinaryFromCache(file: VirtualFile): KotlinBinaryData? {
-        val userData = file.getUserData(KOTLIN_BINARY_DATA_KEY)?.get()
-        if (userData != null && userData.timestamp == file.timeStamp) {
-            return userData
-        }
-
-        val isKotlinBinaryAttribute = if (file is VirtualFileWithId) {
-            attributeService.readBooleanAttribute(KOTLIN_IS_COMPILED_FILE_ATTRIBUTE, file)
-        } else {
-            null
-        }
-
-        if (isKotlinBinaryAttribute != null) {
-            val isKotlinBinary = isKotlinBinaryAttribute.value
-            val kotlinBinaryData = KotlinBinaryData(isKotlinBinary, file.timeStamp, null)
-            if (isKotlinBinary) {
-                file.putUserData(KOTLIN_BINARY_DATA_KEY, SoftReference(kotlinBinaryData))
-            }
-
-            return kotlinBinaryData
-        }
-
-        return null
-    }
-
-    companion object {
-        fun getInstance(): IDEKotlinBinaryClassCache = service()
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
index ada6cbb5f834..8117a2b21fd0 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
@@ -17,12 +17,12 @@ import com.intellij.util.Processor
 import com.intellij.util.Processors
 import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.indexing.IdFilter
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.defaultImplsChild
 import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.asJava.getAccessorLightMethods
 import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.stubindex.*
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.java.getPropertyNamesCandidatesByAccessorName
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/ClsJavaStubByVirtualFileCache.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/ClsJavaStubByVirtualFileCache.kt
deleted file mode 100644
index 9f76b09c0e76..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/ClsJavaStubByVirtualFileCache.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses
-
-import com.intellij.ide.highlighter.JavaClassFileType
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.impl.compiled.ClsFileImpl
-import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
-import com.intellij.psi.impl.java.stubs.impl.PsiJavaFileStubImpl
-import com.intellij.util.cls.ClsFormatException
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.kotlin.idea.util.application.getServiceSafe
-import java.io.IOException
-
-class ClsJavaStubByVirtualFileCache {
-    private class CachedJavaStub(val modificationStamp: Long, val javaFileStub: PsiJavaFileStubImpl)
-
-    private val cache = ContainerUtil.createConcurrentWeakKeySoftValueMap<VirtualFile, CachedJavaStub>()
-
-    fun get(classFile: VirtualFile): PsiJavaFileStubImpl? {
-        val cached = cache.get(classFile)
-        val fileModificationStamp = classFile.modificationStamp
-        if (cached != null && cached.modificationStamp == fileModificationStamp) {
-            return cached.javaFileStub
-        }
-        val stub = createStub(classFile) as PsiJavaFileStubImpl? ?: return null
-        cache.put(classFile, CachedJavaStub(fileModificationStamp, stub))
-        return stub
-    }
-
-    private fun createStub(file: VirtualFile): PsiJavaFileStub? {
-        if (file.fileType !== JavaClassFileType.INSTANCE) return null
-
-        try {
-            return ClsFileImpl.buildFileStub(file, file.contentsToByteArray(false))
-        } catch (e: ClsFormatException) {
-            LOG.warn("Failed to build java cls class for " + file.canonicalPath!!, e)
-        } catch (e: IOException) {
-            LOG.warn("Failed to build java cls class for " + file.canonicalPath!!, e)
-        }
-
-        return null
-    }
-
-    companion object {
-        private val LOG = Logger.getInstance(ClsJavaStubByVirtualFileCache::class.java)
-
-        fun getInstance(project: Project): ClsJavaStubByVirtualFileCache = project.getServiceSafe()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt
index 9f228974a18f..2d51ea4b2d51 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/IDELightClassContexts.kt
@@ -62,7 +62,8 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProvid
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorTypeKind
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.WrappedTypeFactory
@@ -392,7 +393,7 @@ internal object IDELightClassContexts {
 
                 override fun createRecursionIntolerantDeferredType(trace: BindingTrace, computation: () -> KotlinType) = errorType()
 
-                private fun errorType() = ErrorUtils.createErrorType("Error type in ad hoc resolve for lighter classes")
+                private fun errorType() = ErrorUtils.createErrorType(ErrorTypeKind.AD_HOC_ERROR_TYPE_FOR_LIGHTER_CLASSES_RESOLVE)
             })
 
             IdeaEnvironment.configure(this)
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LazyLightClassDataHolder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LazyLightClassDataHolder.kt
index 64b94070c2de..18488a5e9f39 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LazyLightClassDataHolder.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LazyLightClassDataHolder.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightField
 import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.elements.KtLightMethodImpl
+import org.jetbrains.kotlin.asJava.isSyntheticValuesOrValueOfMethod
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
 import org.jetbrains.kotlin.psi.debugText.getDebugText
@@ -111,13 +112,17 @@ sealed class LazyLightClassDataHolder(
                 val fieldName = dummyField.name
                 KtLightFieldImpl.lazy(dummyField, fieldOrigin, containingClass) {
                     val findFieldByName = clsDelegate.findFieldByName(fieldName, false)
-                    findFieldByName.checkMatches(dummyField, containingClass) ?:
-                    // fallback in case of non-matched (like synthetic) fields
-                    //
-                    // it costs some performance and has to happen in rare and odd cases
-                    KtLightFieldImpl.create(
-                        KtLightFieldImpl.getOrigin(dummyField), dummyField, containingClass
-                    )
+
+                    if (findFieldByName != null && findFieldByName.checkMatches(dummyField, containingClass)) {
+                        findFieldByName
+                    } else {
+                        // fallback in case of non-matched (like synthetic) fields
+                        //
+                        // it costs some performance and has to happen in rare and odd cases
+                        KtLightFieldImpl.create(
+                            KtLightFieldImpl.getOrigin(dummyField), dummyField, containingClass
+                        )
+                    }
                 }
             }
         }
@@ -125,25 +130,30 @@ sealed class LazyLightClassDataHolder(
         override fun getOwnMethods(containingClass: KtLightClass): List<KtLightMethod> {
             if (dummyDelegate == null) return KtLightMethodImpl.fromClsMethods(clsDelegate, containingClass)
 
-            return dummyDelegate!!.methods.map { dummyMethod ->
+            return dummyDelegate!!.methods.mapNotNull { dummyMethod ->
+                if (isSyntheticValuesOrValueOfMethod(dummyMethod)) {
+                    return@mapNotNull null
+                }
+
                 val methodOrigin = KtLightMethodImpl.getOrigin(dummyMethod)
 
                 KtLightMethodImpl.lazy(dummyMethod, containingClass, methodOrigin) {
-                    val dummyIndex = dummyMethod.memberIndex!!
-
-                    val byMemberIndex: (PsiMethod) -> Boolean = { it.memberIndex == dummyIndex }
-
                     /* Searching all methods may be necessary in some cases where we failed to rollback optimization:
                        Overriding internal member that was final
 
                        Resulting light member is not consistent in this case, so this should happen only for erroneous code
                     */
-                    val findMethodsByName = clsDelegate.findMethodsByName(dummyMethod.name, false)
+                    val dummyIndex = dummyMethod.memberIndex
+                    if (dummyIndex != null) {
+                        val methodsWithSameName = clsDelegate.findMethodsByName(dummyMethod.name, false)
+                        val candidateMethod = methodsWithSameName.firstOrNull { it.memberIndex == dummyIndex }
+                            ?: clsDelegate.methods.firstOrNull { it.memberIndex == dummyIndex }
 
-                    val candidateDelegateMethod = findMethodsByName.firstOrNull(byMemberIndex)
-                        ?: clsDelegate.methods.firstOrNull(byMemberIndex)
+                        if (candidateMethod != null && candidateMethod.checkMatches(dummyMethod, containingClass)) {
+                            return@lazy candidateMethod
+                        }
+                    }
 
-                    candidateDelegateMethod.checkMatches(dummyMethod, containingClass) ?:
                     // fallback if unable to find method for a dummy method (e.g. synthetic methods marked explicit or implicit) are
                     // not visible as own methods.
                     //
@@ -154,20 +164,15 @@ sealed class LazyLightClassDataHolder(
         }
     }
 
-    private fun <T : PsiMember> T?.checkMatches(dummyMember: T, containingClass: KtLightClass): T? {
-        if (this == null) {
-            logMismatch("Couldn't match ${dummyMember.debugName}", containingClass)
-            return null
-        }
-
+    private fun <T : PsiMember> T.checkMatches(dummyMember: T, containingClass: KtLightClass): Boolean {
         val parameterCountMatches = ((this as? PsiMethod)?.parameterList?.parametersCount ?: 0) ==
                 ((dummyMember as? PsiMethod)?.parameterList?.parametersCount ?: 0)
         if (this.memberIndex != dummyMember.memberIndex || !parameterCountMatches) {
             logMismatch("Wrongly matched ${dummyMember.debugName} to ${this.debugName}", containingClass)
-            return null
+            return false
         }
 
-        return this
+        return true
     }
 
     companion object {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt
deleted file mode 100644
index ede3d5236621..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses
-
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiField
-import com.intellij.psi.PsiMember
-import com.intellij.psi.PsiMethod
-import com.intellij.psi.impl.compiled.SignatureParsing
-import com.intellij.util.cls.ClsFormatException
-import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin
-import org.jetbrains.kotlin.asJava.classes.lazyPub
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndexer
-import org.jetbrains.kotlin.load.java.JvmAbi
-import org.jetbrains.kotlin.load.kotlin.MemberSignature
-import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtDeclarationContainer
-import org.jetbrains.kotlin.resolve.calls.components.hasDefaultValue
-import org.jetbrains.kotlin.resolve.descriptorUtil.classId
-import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
-import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.resolve.jvm.annotations.findJvmOverloadsAnnotation
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassConstructorDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
-import org.jetbrains.kotlin.type.MapPsiToAsmDesc
-import java.text.CharacterIterator
-import java.text.StringCharacterIterator
-
-interface LightMemberOriginForCompiledElement<T : PsiMember> : LightMemberOrigin {
-    val member: T
-
-    override val originKind: JvmDeclarationOriginKind
-        get() = JvmDeclarationOriginKind.OTHER
-
-    override fun isEquivalentTo(other: PsiElement?): Boolean {
-        return when (other) {
-            is KtDeclaration -> originalElement?.isEquivalentTo(other) ?: false
-            is PsiMember -> member.isEquivalentTo(other)
-            else -> false
-        }
-    }
-
-    override fun isValid(): Boolean = member.isValid
-}
-
-
-data class LightMemberOriginForCompiledField(val psiField: PsiField, val file: KtClsFile) : LightMemberOriginForCompiledElement<PsiField> {
-    override val member: PsiField
-        get() = psiField
-
-    override fun copy(): LightMemberOrigin {
-        return LightMemberOriginForCompiledField(psiField.copy() as PsiField, file)
-    }
-
-    override fun isEquivalentTo(other: LightMemberOrigin?): Boolean {
-        if (other !is LightMemberOriginForCompiledField) return false
-        return psiField.isEquivalentTo(other.psiField)
-    }
-
-    override val originalElement: KtDeclaration? by lazyPub {
-        val desc = MapPsiToAsmDesc.typeDesc(psiField.type)
-        val signature = MemberSignature.fromFieldNameAndDesc(psiField.name, desc)
-        findDeclarationInCompiledFile(file, psiField, signature)
-    }
-}
-
-data class LightMemberOriginForCompiledMethod(val psiMethod: PsiMethod, val file: KtClsFile) :
-    LightMemberOriginForCompiledElement<PsiMethod> {
-
-    override val member: PsiMethod
-        get() = psiMethod
-
-    override fun isEquivalentTo(other: LightMemberOrigin?): Boolean {
-        if (other !is LightMemberOriginForCompiledMethod) return false
-        return psiMethod.isEquivalentTo(other.psiMethod)
-    }
-
-    override fun copy(): LightMemberOrigin {
-        return LightMemberOriginForCompiledMethod(psiMethod.copy() as PsiMethod, file)
-    }
-
-    override val originalElement: KtDeclaration? by lazyPub {
-        val desc = MapPsiToAsmDesc.methodDesc(psiMethod)
-        val name = if (psiMethod.isConstructor) "<init>" else psiMethod.name
-        val signature = MemberSignature.fromMethodNameAndDesc(name, desc)
-        findDeclarationInCompiledFile(file, psiMethod, signature)
-    }
-}
-
-internal fun findDeclarationInCompiledFile(file: KtClsFile, member: PsiMember, signature: MemberSignature): KtDeclaration? {
-    val relativeClassName = member.relativeClassName()
-    val key = ClassNameAndSignature(relativeClassName, signature)
-
-    val memberName = member.name
-
-    if (memberName != null && !file.isContentsLoaded && file.hasDeclarationWithKey(ByJvmSignatureIndexer, key)) {
-        val container: KtDeclarationContainer? = if (relativeClassName.isEmpty())
-            file
-        else {
-            val topClassOrObject = file.declarations.singleOrNull() as? KtClassOrObject
-            relativeClassName.fold(topClassOrObject) { classOrObject, name ->
-                classOrObject?.declarations?.singleOrNull { it.name == name.asString() } as? KtClassOrObject
-            }
-        }
-
-        val declaration = container?.declarations?.singleOrNull {
-            it.name == memberName
-        }
-
-        if (declaration != null) {
-            return declaration
-        }
-    }
-
-    return file.getDeclaration(ByJvmSignatureIndexer, key)
-}
-
-// this is convenient data structure for this purpose and is not supposed to be used outside this file
-// every member is represented by its jvm signature and relative class name (which is easy to obtain from descriptors or cls psi)
-
-// relative class name is a path containing inner/nested class names from top level class to the class containing this member (excluding top level class name)
-// Examples: for top level function or function in a top level class relativeClassName is empty
-// For: class TopLevel { class A { class B { fun f() } } }
-// relativeClassName for function 'f' will be [A, B]
-private data class ClassNameAndSignature(val relativeClassName: List<Name>, val memberSignature: MemberSignature)
-
-private fun PsiMember.relativeClassName(): List<Name> {
-    return generateSequence(this.containingClass) { it.containingClass }.toList().dropLast(1).reversed().map { Name.identifier(it.name!!) }
-}
-
-private fun ClassDescriptor.relativeClassName(): List<Name> {
-    return classId!!.relativeClassName.pathSegments().drop(1)
-}
-
-private fun excludeParametersFromDescriptor(descriptor: String, omittedParameters: List<Int>): String? {
-
-    fun tryParseParametersAndReturnType(): Pair<List<String>, String>? {
-        val iterator = StringCharacterIterator(descriptor)
-
-        fun parseTypeString(): String? {
-            val begin = iterator.index
-            try {
-                SignatureParsing.parseTypeString(iterator) { it }
-            } catch (e: ClsFormatException) {
-                return null
-            }
-            val end = iterator.index
-            return descriptor.substring(begin, end)
-        }
-
-        if (iterator.current() != '(') return null
-        iterator.next()
-
-        if (iterator.current() == ')') {
-            iterator.next()
-            val returnType = parseTypeString() ?: return null
-            return emptyList<String>() to returnType
-        }
-
-        val parameterTypes = mutableListOf<String>()
-        while (iterator.current() != ')' && iterator.current() != CharacterIterator.DONE) {
-            parameterTypes += parseTypeString() ?: return null
-        }
-
-        if (iterator.current() != ')') return null
-        iterator.next()
-
-        val returnType = parseTypeString() ?: return null
-        return parameterTypes to returnType
-    }
-
-    val (parameterTypes, returnType) = tryParseParametersAndReturnType() ?: return null
-
-    val parametersList = parameterTypes
-        .filterIndexed { index, _ -> index !in omittedParameters }
-        .joinToString("")
-
-    return "($parametersList)$returnType"
-}
-
-private fun ClassDescriptor.desc(): String = "L" + JvmClassName.byClassId(classId!!).internalName + ";"
-
-private object ByJvmSignatureIndexer : DecompiledTextIndexer<ClassNameAndSignature> {
-    override fun indexDescriptor(descriptor: DeclarationDescriptor): Collection<ClassNameAndSignature> {
-        val signatures = arrayListOf<ClassNameAndSignature>()
-        fun save(id: List<Name>, signature: MemberSignature) {
-            signatures.add(ClassNameAndSignature(id, signature))
-        }
-
-        fun ClassDescriptor.apply() {
-            when (kind) {
-                ClassKind.ENUM_ENTRY -> {
-                    val enumClass = containingDeclaration as ClassDescriptor
-                    val signature = MemberSignature.fromFieldNameAndDesc(name.asString(), enumClass.desc())
-                    save(enumClass.relativeClassName(), signature)
-                }
-                ClassKind.OBJECT -> {
-                    val instanceFieldSignature = MemberSignature.fromFieldNameAndDesc(JvmAbi.INSTANCE_FIELD, desc())
-                    save(relativeClassName(), instanceFieldSignature)
-                    if (isCompanionObject) {
-                        val signature = MemberSignature.fromFieldNameAndDesc(name.asString(), desc())
-                        save((containingDeclaration as? ClassDescriptor)?.relativeClassName().orEmpty(), signature)
-                    }
-                }
-                else -> {
-                }
-            }
-        }
-
-        fun DeserializedClassConstructorDescriptor.apply() {
-            JvmProtoBufUtil.getJvmConstructorSignature(proto, nameResolver, typeTable)?.let {
-                val id = (containingDeclaration as? ClassDescriptor)?.relativeClassName().orEmpty()
-                val signature = MemberSignature.fromJvmMemberSignature(it)
-                save(id, signature)
-            }
-        }
-
-        fun DeserializedSimpleFunctionDescriptor.apply() {
-            JvmProtoBufUtil.getJvmMethodSignature(proto, nameResolver, typeTable)?.let {
-                val id = (containingDeclaration as? ClassDescriptor)?.relativeClassName().orEmpty()
-
-                val signature = MemberSignature.fromJvmMemberSignature(it)
-                save(id, signature)
-
-                if (findJvmOverloadsAnnotation() == null) return
-
-                val extensionShift = if (isExtension) 1 else 0
-
-                val omittedList = mutableListOf<Int>()
-                valueParameters.asReversed().forEach { parameter ->
-                    if (parameter.hasDefaultValue()) {
-                        omittedList.add(parameter.index + extensionShift)
-                        val newDescriptor = excludeParametersFromDescriptor(it.desc, omittedList)
-                        if (newDescriptor != null) {
-                            val overloadedSignature = MemberSignature.fromMethodNameAndDesc(it.name, newDescriptor)
-                            save(id, overloadedSignature)
-                        }
-                    }
-                }
-            }
-        }
-
-        fun DeserializedPropertyDescriptor.apply() {
-            val className = (containingDeclaration as? ClassDescriptor)?.relativeClassName().orEmpty()
-            val signature = proto.getExtensionOrNull(JvmProtoBuf.propertySignature)
-            if (signature != null) {
-                val fieldSignature = JvmProtoBufUtil.getJvmFieldSignature(proto, nameResolver, typeTable)
-                if (fieldSignature != null) {
-                    save(className, MemberSignature.fromJvmMemberSignature(fieldSignature))
-                }
-                if (signature.hasGetter()) {
-                    save(className, MemberSignature.fromMethod(nameResolver, signature.getter))
-                }
-                if (signature.hasSetter()) {
-                    save(className, MemberSignature.fromMethod(nameResolver, signature.setter))
-                }
-            }
-        }
-
-        when (descriptor) {
-            is ClassDescriptor -> descriptor.apply()
-            is DeserializedClassConstructorDescriptor -> descriptor.apply()
-            is DeserializedSimpleFunctionDescriptor -> descriptor.apply()
-            is DeserializedPropertyDescriptor -> descriptor.apply()
-        }
-
-        return signatures
-    }
-}
-
-// expose with different type
-val BySignatureIndexer: DecompiledTextIndexer<*> = ByJvmSignatureIndexer
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightClassForDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightClassForDecompiledDeclaration.kt
deleted file mode 100644
index a28fe1e15545..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightClassForDecompiledDeclaration.kt
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses
-
-import com.intellij.openapi.util.Pair
-import com.intellij.psi.*
-import com.intellij.psi.impl.PsiClassImplUtil
-import com.intellij.psi.impl.PsiImplUtil
-import com.intellij.psi.impl.PsiSuperMethodImplUtil
-import com.intellij.psi.javadoc.PsiDocComment
-import com.intellij.psi.scope.PsiScopeProcessor
-import com.intellij.psi.util.PsiUtil
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
-import org.jetbrains.kotlin.asJava.classes.KotlinClassInnerStuffCache
-import org.jetbrains.kotlin.asJava.classes.LightClassesLazyCreator
-import org.jetbrains.kotlin.asJava.classes.lazyPub
-import org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations.KtLightEnumEntryForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations.KtLightFieldForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations.KtLightMethodForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
-import org.jetbrains.kotlin.psi.KtClassOrObject
-
-open class KtLightClassForDecompiledDeclaration(
-    override val clsDelegate: PsiClass,
-    private val clsParent: PsiElement,
-    private val file: KtClsFile,
-    kotlinOrigin: KtClassOrObject?
-) : KtLightClassForDecompiledDeclarationBase(clsDelegate, clsParent, kotlinOrigin) {
-
-    private val myInnersCache = KotlinClassInnerStuffCache(
-        myClass = this,
-        externalDependencies = listOf(KotlinModificationTrackerService.getInstance(manager.project).outOfBlockModificationTracker),
-        lazyCreator = LightClassesLazyCreator(project)
-    )
-
-    override fun getOwnMethods(): MutableList<PsiMethod> = _methods
-
-    override fun getOwnFields(): MutableList<PsiField> = _fields
-
-    override fun getOwnInnerClasses(): MutableList<PsiClass> = _innerClasses
-
-    override fun getFields() = myInnersCache.fields
-
-    override fun getMethods() = myInnersCache.methods
-
-    override fun getConstructors() = myInnersCache.constructors
-
-    override fun getInnerClasses() = myInnersCache.innerClasses
-
-    override fun findFieldByName(name: String, checkBases: Boolean) = myInnersCache.findFieldByName(name, checkBases)
-
-    override fun findMethodsByName(name: String, checkBases: Boolean) = myInnersCache.findMethodsByName(name, checkBases)
-
-    override fun findInnerClassByName(name: String, checkBases: Boolean) = myInnersCache.findInnerClassByName(name, checkBases)
-
-    override fun hasModifierProperty(name: String): Boolean =
-        clsDelegate.hasModifierProperty(name)
-
-    override fun findMethodBySignature(patternMethod: PsiMethod?, checkBases: Boolean): PsiMethod? =
-        patternMethod?.let { PsiClassImplUtil.findMethodBySignature(this, it, checkBases) }
-
-    override fun findMethodsBySignature(patternMethod: PsiMethod?, checkBases: Boolean): Array<PsiMethod?> =
-        patternMethod?.let { PsiClassImplUtil.findMethodsBySignature(this, it, checkBases) } ?: emptyArray()
-
-    override fun findMethodsAndTheirSubstitutorsByName(@NonNls name: String?, checkBases: Boolean): List<Pair<PsiMethod, PsiSubstitutor>> =
-        PsiClassImplUtil.findMethodsAndTheirSubstitutorsByName(this, name, checkBases)
-
-    override fun getImplementsList(): PsiReferenceList? = clsDelegate.implementsList
-
-    override fun getRBrace(): PsiElement? = null
-
-    override fun getLBrace(): PsiElement? = null
-
-    override fun getInitializers(): Array<PsiClassInitializer> = clsDelegate.initializers
-
-    override fun getContainingClass(): PsiClass? = parent as? PsiClass
-
-    override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = clsDelegate.isInheritorDeep(baseClass, classToByPass)
-
-    override fun getAllMethodsAndTheirSubstitutors(): List<Pair<PsiMethod?, PsiSubstitutor?>?> =
-        PsiClassImplUtil.getAllWithSubstitutorsByMap<PsiMethod>(this, PsiClassImplUtil.MemberType.METHOD)
-
-    override fun isInterface(): Boolean = clsDelegate.isInterface
-
-    override fun getTypeParameters(): Array<PsiTypeParameter> =
-        clsDelegate.typeParameters
-
-    override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean =
-        clsDelegate.isInheritor(baseClass, checkDeep)
-
-    override fun processDeclarations(
-        processor: PsiScopeProcessor,
-        state: ResolveState,
-        lastParent: PsiElement?,
-        place: PsiElement
-    ): Boolean {
-        if (isEnum) {
-            if (!KotlinClassInnerStuffCache.processDeclarationsInEnum(processor, state, myInnersCache)) return false
-        }
-        return PsiClassImplUtil.processDeclarationsInClass(
-            this, processor, state, null,
-            lastParent, place, PsiUtil.getLanguageLevel(place), false
-        )
-    }
-
-    override fun isEnum(): Boolean = clsDelegate.isEnum
-
-    override fun getExtendsListTypes(): Array<PsiClassType?> =
-        PsiClassImplUtil.getExtendsListTypes(this)
-
-    override fun getTypeParameterList(): PsiTypeParameterList? = clsDelegate.typeParameterList
-
-    override fun isAnnotationType(): Boolean = clsDelegate.isAnnotationType
-
-    override fun getNameIdentifier(): PsiIdentifier? = clsDelegate.nameIdentifier
-
-    override fun getInterfaces(): Array<PsiClass> =
-        PsiClassImplUtil.getInterfaces(this)
-
-    override fun getSuperClass(): PsiClass? =
-        PsiClassImplUtil.getSuperClass(this)
-
-    override fun getSupers(): Array<PsiClass> =
-        PsiClassImplUtil.getSupers(this)
-
-    override fun getSuperTypes(): Array<PsiClassType> =
-        PsiClassImplUtil.getSuperTypes(this)
-
-    override fun getVisibleSignatures(): MutableCollection<HierarchicalMethodSignature> =
-        PsiSuperMethodImplUtil.getVisibleSignatures(this)
-
-    override fun getQualifiedName(): String? = clsDelegate.qualifiedName
-
-    override fun getImplementsListTypes(): Array<PsiClassType?> =
-        PsiClassImplUtil.getImplementsListTypes(this)
-
-    override fun isDeprecated(): Boolean = clsDelegate.isDeprecated
-
-    override fun setName(name: String): PsiElement = clsDelegate.setName(name)
-
-    override fun hasTypeParameters(): Boolean =
-        PsiImplUtil.hasTypeParameters(this)
-
-    override fun getExtendsList(): PsiReferenceList? = clsDelegate.extendsList
-
-    override fun getDocComment(): PsiDocComment? = clsDelegate.docComment
-
-    override fun getModifierList(): PsiModifierList? = clsDelegate.modifierList
-
-    override fun getScope(): PsiElement = clsDelegate.scope
-
-    override fun getAllInnerClasses(): Array<PsiClass> = PsiClassImplUtil.getAllInnerClasses(this)
-
-    override fun getAllMethods(): Array<PsiMethod> = PsiClassImplUtil.getAllMethods(this)
-
-    override fun getAllFields(): Array<PsiField> = PsiClassImplUtil.getAllFields(this)
-
-    private val _methods: MutableList<PsiMethod> by lazyPub {
-        mutableListOf<PsiMethod>().also {
-            clsDelegate.methods.mapTo(it) { psiMethod ->
-                KtLightMethodForDecompiledDeclaration(
-                    funDelegate = psiMethod,
-                    funParent = this,
-                    lightMemberOrigin = LightMemberOriginForCompiledMethod(psiMethod, file)
-                )
-            }
-        }
-    }
-
-    private val _fields: MutableList<PsiField> by lazyPub {
-        mutableListOf<PsiField>().also {
-            clsDelegate.fields.mapTo(it) { psiField ->
-                if (psiField !is PsiEnumConstant) {
-                    KtLightFieldForDecompiledDeclaration(
-                        fldDelegate = psiField,
-                        fldParent = this,
-                        lightMemberOrigin = LightMemberOriginForCompiledField(psiField, file)
-                    )
-                } else {
-                    KtLightEnumEntryForDecompiledDeclaration(
-                        fldDelegate = psiField,
-                        fldParent = this,
-                        lightMemberOrigin = LightMemberOriginForCompiledField(psiField, file),
-                        file = file
-                    )
-                }
-            }
-        }
-    }
-
-    private val _innerClasses: MutableList<PsiClass> by lazyPub {
-        mutableListOf<PsiClass>().also {
-            clsDelegate.innerClasses.mapTo(it) { psiClass ->
-                val innerDeclaration = kotlinOrigin
-                    ?.declarations
-                    ?.filterIsInstance<KtClassOrObject>()
-                    ?.firstOrNull { cls -> cls.name == clsDelegate.name }
-
-                KtLightClassForDecompiledDeclaration(
-                    clsDelegate = psiClass,
-                    clsParent = this,
-                    file = file,
-                    kotlinOrigin = innerDeclaration,
-                )
-            }
-        }
-    }
-
-    override val originKind: LightClassOriginKind = LightClassOriginKind.BINARY
-
-    override fun getNavigationElement() = kotlinOrigin?.navigationElement ?: file
-
-    override fun equals(other: Any?): Boolean {
-        return this === other || other is KtLightClassForDecompiledDeclaration &&
-                qualifiedName == other.qualifiedName &&
-                kotlinOrigin?.fqName == other.kotlinOrigin?.fqName
-    }
-
-    override fun hashCode(): Int = qualifiedName?.hashCode() ?: kotlinOrigin?.fqName?.hashCode() ?: 0
-
-    override fun copy(): PsiElement = this
-
-    override fun clone(): Any = this
-
-    override fun toString(): String = "${this.javaClass.simpleName} of $parent"
-
-    override fun getName(): String? = clsDelegate.name
-
-    override fun isValid(): Boolean = file.isValid && clsDelegate.isValid && (kotlinOrigin?.isValid != false)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumClassForDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumClassForDecompiledDeclaration.kt
deleted file mode 100644
index cda29b5a1122..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumClassForDecompiledDeclaration.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations
-
-import com.intellij.psi.*
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.psi.KtClassOrObject
-
-internal class KtLightEnumClassForDecompiledDeclaration(
-    private val psiConstantInitializer: PsiEnumConstantInitializer,
-    private val enumConstant: KtLightEnumEntryForDecompiledDeclaration,
-    clsParent: KtLightClassForDecompiledDeclaration,
-    file: KtClsFile,
-    kotlinOrigin: KtClassOrObject?
-) :
-    KtLightClassForDecompiledDeclaration(
-        clsDelegate = psiConstantInitializer,
-        clsParent = clsParent,
-        file = file,
-        kotlinOrigin = kotlinOrigin
-    ), PsiEnumConstantInitializer {
-
-    override fun getBaseClassType(): PsiClassType = psiConstantInitializer.baseClassType
-
-    override fun getArgumentList(): PsiExpressionList? = psiConstantInitializer.argumentList
-
-    override fun getEnumConstant(): PsiEnumConstant = enumConstant
-
-    override fun getBaseClassReference(): PsiJavaCodeReferenceElement = psiConstantInitializer.baseClassReference
-
-    override fun isInQualifiedNew(): Boolean = psiConstantInitializer.isInQualifiedNew
-
-    override fun equals(other: Any?): Boolean = other is KtLightEnumClassForDecompiledDeclaration && super.equals(other)
-    override fun hashCode(): Int = super.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumEntryForDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumEntryForDecompiledDeclaration.kt
deleted file mode 100644
index 18ea861d7263..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightEnumEntryForDecompiledDeclaration.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations
-
-import com.intellij.psi.*
-import org.jetbrains.kotlin.asJava.classes.lazyPub
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
-import org.jetbrains.kotlin.idea.caches.lightClasses.LightMemberOriginForCompiledField
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-
-internal class KtLightEnumEntryForDecompiledDeclaration(
-    private val fldDelegate: PsiEnumConstant,
-    fldParent: KtLightClassForDecompiledDeclaration,
-    lightMemberOrigin: LightMemberOriginForCompiledField,
-    file: KtClsFile,
-) : KtLightFieldForDecompiledDeclaration(
-    fldDelegate,
-    fldParent,
-    lightMemberOrigin
-), PsiEnumConstant {
-
-    private val _initializingClass: PsiEnumConstantInitializer? by lazyPub {
-        fldDelegate.initializingClass?.let {
-            KtLightEnumClassForDecompiledDeclaration(
-                psiConstantInitializer = it,
-                enumConstant = this,
-                clsParent = fldParent,
-                file = file,
-                kotlinOrigin = null
-            )
-        }
-    }
-
-    override fun getArgumentList(): PsiExpressionList? = fldDelegate.argumentList
-    override fun resolveConstructor(): PsiMethod? = fldDelegate.resolveConstructor()
-    override fun resolveMethod(): PsiMethod? = fldDelegate.resolveMethod()
-    override fun resolveMethodGenerics(): JavaResolveResult = fldDelegate.resolveMethodGenerics()
-    override fun getInitializingClass(): PsiEnumConstantInitializer? = _initializingClass
-    override fun getOrCreateInitializingClass(): PsiEnumConstantInitializer =
-        _initializingClass ?: error("cannot create initializing class in light enum constant")
-
-    override fun equals(other: Any?): Boolean = other is KtLightEnumEntryForDecompiledDeclaration && super.equals(other)
-    override fun hashCode(): Int = super.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightFieldForDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightFieldForDecompiledDeclaration.kt
deleted file mode 100644
index 2eff66472c3b..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightFieldForDecompiledDeclaration.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations
-
-import com.intellij.psi.*
-import com.intellij.psi.impl.PsiVariableEx
-import com.intellij.psi.javadoc.PsiDocComment
-import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
-import org.jetbrains.kotlin.asJava.elements.KtLightFieldForSourceDeclarationSupport
-import org.jetbrains.kotlin.asJava.elements.KtLightMember
-import org.jetbrains.kotlin.idea.caches.lightClasses.LightMemberOriginForCompiledField
-import org.jetbrains.kotlin.psi.KtDeclaration
-
-open class KtLightFieldForDecompiledDeclaration(
-    private val fldDelegate: PsiField,
-    private val fldParent: KtLightClass,
-    override val lightMemberOrigin: LightMemberOriginForCompiledField
-) : KtLightElementBase(fldParent), PsiField, KtLightFieldForSourceDeclarationSupport, KtLightMember<PsiField>, PsiVariableEx {
-
-    override val kotlinOrigin: KtDeclaration? get() = lightMemberOrigin.originalElement
-
-    override fun hasModifierProperty(name: String): Boolean = fldDelegate.hasModifierProperty(name)
-
-    override fun setInitializer(initializer: PsiExpression?) {
-        fldDelegate.initializer = initializer
-    }
-
-    override fun getContainingClass(): KtLightClass = fldParent
-
-    override fun normalizeDeclaration() = fldDelegate.normalizeDeclaration()
-
-    override fun getNameIdentifier(): PsiIdentifier = fldDelegate.nameIdentifier
-
-    override fun getName(): String = fldDelegate.name
-
-    override fun getInitializer(): PsiExpression? = fldDelegate.initializer
-
-    override fun getDocComment(): PsiDocComment? = fldDelegate.docComment
-
-    override fun getTypeElement(): PsiTypeElement? = fldDelegate.typeElement
-
-    override fun getModifierList(): PsiModifierList? = fldDelegate.modifierList
-
-    override fun hasInitializer(): Boolean = fldDelegate.hasInitializer()
-
-    override fun getType(): PsiType = fldDelegate.type
-
-    override fun isDeprecated(): Boolean = fldDelegate.isDeprecated
-
-    override fun setName(name: String): PsiElement = fldDelegate.setName(name)
-
-    override fun computeConstantValue(): Any? = fldDelegate.computeConstantValue()
-
-    override fun computeConstantValue(visitedVars: MutableSet<PsiVariable>?): Any? = (fldDelegate as? PsiVariableEx)?.computeConstantValue(visitedVars)
-
-    override fun equals(other: Any?): Boolean = other is KtLightFieldForDecompiledDeclaration &&
-            name == other.name &&
-            fldParent == other.fldParent &&
-            fldDelegate == other.fldDelegate
-
-    override fun hashCode(): Int = name.hashCode()
-
-    override fun copy(): PsiElement = this
-
-    override fun clone(): Any = this
-
-    override fun toString(): String = "${this.javaClass.simpleName} of $fldParent"
-
-    override val clsDelegate: PsiField = fldDelegate
-
-    override fun isValid(): Boolean = parent.isValid
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightMethodForDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightMethodForDecompiledDeclaration.kt
deleted file mode 100644
index b837fbbe7c71..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/decompiledDeclarations/KtLightMethodForDecompiledDeclaration.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.caches.lightClasses.decompiledDeclarations
-
-import com.intellij.psi.*
-import com.intellij.psi.impl.PsiSuperMethodImplUtil
-import com.intellij.psi.javadoc.PsiDocComment
-import com.intellij.psi.util.MethodSignature
-import com.intellij.psi.util.MethodSignatureBackedByPsiMethod
-import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
-import org.jetbrains.kotlin.asJava.elements.KtLightMember
-import org.jetbrains.kotlin.asJava.elements.KtLightMethod
-import org.jetbrains.kotlin.asJava.propertyNameByAccessor
-import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
-import org.jetbrains.kotlin.idea.caches.lightClasses.LightMemberOriginForCompiledMethod
-import org.jetbrains.kotlin.psi.KtDeclaration
-
-class KtLightMethodForDecompiledDeclaration(
-    private val funDelegate: PsiMethod,
-    private val funParent: KtLightClass,
-    override val lightMemberOrigin: LightMemberOriginForCompiledMethod,
-) : KtLightElementBase(funParent), PsiMethod, KtLightMethod, KtLightMember<PsiMethod> {
-
-    override val kotlinOrigin: KtDeclaration? get() = lightMemberOrigin.originalElement
-
-    override val isMangled: Boolean get() = checkIsMangled()
-
-    override fun hasModifierProperty(name: String): Boolean = funDelegate.hasModifierProperty(name)
-
-    override fun getReturnTypeElement(): PsiTypeElement? = funDelegate.returnTypeElement
-
-    override fun getContainingClass(): KtLightClass = funParent
-
-    override fun getTypeParameters(): Array<PsiTypeParameter> = funDelegate.typeParameters
-
-    override fun getThrowsList(): PsiReferenceList = funDelegate.throwsList
-
-    override fun getReturnType(): PsiType? = funDelegate.returnType
-
-    override fun hasTypeParameters(): Boolean = funDelegate.hasTypeParameters()
-
-    override fun getTypeParameterList(): PsiTypeParameterList? = funDelegate.typeParameterList
-
-    override fun isVarArgs(): Boolean = funDelegate.isVarArgs
-
-    override fun isConstructor(): Boolean = funDelegate.isConstructor
-
-    override fun getNameIdentifier(): PsiIdentifier? = funDelegate.nameIdentifier
-
-    override fun getName(): String = funDelegate.name
-
-    override fun getDocComment(): PsiDocComment? = funDelegate.docComment
-
-    override fun getModifierList(): PsiModifierList = funDelegate.modifierList
-
-    override fun getBody(): PsiCodeBlock? = null
-
-    override fun getDefaultValue(): PsiAnnotationMemberValue? = (funDelegate as? PsiAnnotationMethod)?.defaultValue
-
-    override fun isDeprecated(): Boolean = funDelegate.isDeprecated
-
-    override fun setName(name: String): PsiElement = funDelegate.setName(name)
-
-    override fun getParameterList(): PsiParameterList = funDelegate.parameterList
-
-    override fun getHierarchicalMethodSignature() = PsiSuperMethodImplUtil.getHierarchicalMethodSignature(this)
-
-    override fun findSuperMethodSignaturesIncludingStatic(checkAccess: Boolean): List<MethodSignatureBackedByPsiMethod> =
-        PsiSuperMethodImplUtil.findSuperMethodSignaturesIncludingStatic(this, checkAccess)
-
-    override fun findDeepestSuperMethod() = PsiSuperMethodImplUtil.findDeepestSuperMethod(this)
-
-    override fun findDeepestSuperMethods(): Array<out PsiMethod> = PsiSuperMethodImplUtil.findDeepestSuperMethods(this)
-
-    override fun findSuperMethods(): Array<out PsiMethod> = PsiSuperMethodImplUtil.findSuperMethods(this)
-
-    override fun findSuperMethods(checkAccess: Boolean): Array<out PsiMethod> =
-        PsiSuperMethodImplUtil.findSuperMethods(this, checkAccess)
-
-    override fun findSuperMethods(parentClass: PsiClass?): Array<out PsiMethod> =
-        PsiSuperMethodImplUtil.findSuperMethods(this, parentClass)
-
-    override fun getSignature(substitutor: PsiSubstitutor): MethodSignature =
-        MethodSignatureBackedByPsiMethod.create(this, substitutor)
-
-    override fun equals(other: Any?): Boolean = other is KtLightMethodForDecompiledDeclaration &&
-            name == other.name &&
-            funParent == other.funParent &&
-            funDelegate == other.funDelegate
-
-    override fun hashCode(): Int = name.hashCode()
-
-    override fun copy(): PsiElement = this
-
-    override fun clone(): Any = this
-
-    override fun toString(): String = "${this.javaClass.simpleName} of $funParent"
-
-    override val clsDelegate: PsiMethod = funDelegate
-
-    override fun isValid(): Boolean = parent.isValid
-}
-
-private fun KtLightMethod.checkIsMangled(): Boolean {
-    val demangledName = KotlinTypeMapper.InternalNameMapper.demangleInternalName(name) ?: return false
-    val originalName = propertyNameByAccessor(demangledName, this) ?: demangledName
-    return originalName == kotlinOrigin?.name
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt
index 3541e3c213fa..18f79dff2f81 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt
@@ -11,10 +11,10 @@ import com.intellij.openapi.util.Key
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware
 import org.jetbrains.kotlin.idea.core.script.ScriptRelatedModuleNameFile
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt
index 6390dac4f157..62dbdb086a53 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/moduleInfosFromIdeaModel.kt
@@ -63,13 +63,13 @@ class IdeaModelInfosCache(
 // Workaround for duplicated libraries, see KT-42607
 internal class LibraryWrapper(val library: LibraryEx) {
     private val allRootUrls by lazy {
-            mutableSetOf<String>().apply {
-                for (orderRootType in OrderRootType.getAllTypes()) {
-                    ProgressManager.checkCanceled()
-                    addAll(library.rootProvider.getUrls(orderRootType))
-                }
+        mutableSetOf<String>().apply {
+            for (orderRootType in OrderRootType.getAllTypes()) {
+                ProgressManager.checkCanceled()
+                addAll(library.rootProvider.getUrls(orderRootType))
             }
         }
+    }
 
     private val hashCode by lazy {
         31 + allRootUrls.hashCode()
@@ -134,16 +134,20 @@ private fun mergePlatformModules(
 ): List<IdeaModuleInfo> {
     if (platform.isCommon()) return allModules
 
-    val platformModules =
-        allModules.flatMap { module ->
-            if (module.platform == platform && module.expectedBy.isNotEmpty())
-                listOf(module to module.expectedBy)
-            else emptyList()
-        }.map { (module, expectedBys) ->
-            PlatformModuleInfo(module, expectedBys.closure(preserveOrder = true) { it.expectedBy }.toList())
-        }
+    val knownCommonModules = mutableSetOf<ModuleSourceInfo>()
+    val platformModules = allModules.mapNotNull { module ->
+        if (module.platform != platform || module.expectedBy.isEmpty() || module in knownCommonModules)
+            return@mapNotNull null
+
+        val commonModules = module.expectedBy
+            .onEach { commonModule -> knownCommonModules.add(commonModule) }
+            .closure { it.expectedBy.onEach { commonModule -> knownCommonModules.add(commonModule) } }
+            .toList()
+
+        PlatformModuleInfo(module, commonModules)
+    }.filter { it.platformModule !in knownCommonModules }
 
-    val rest = allModules - platformModules.flatMap { it.containedModules }
+    val rest = allModules - platformModules.flatMapTo(mutableSetOf()) { it.containedModules }
     return rest + platformModules
 }
 
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
index 22d5237b193c..e9b9142d0d62 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.externalSystem.service.project.IdeModelsProviderImpl
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.caches.project.cacheInvalidatingOnRootModifications
@@ -31,6 +32,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.isCommon
 import org.jetbrains.kotlin.platform.konan.NativePlatform
 import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget
+import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
 import org.jetbrains.kotlin.types.typeUtil.closure
 
 val Module.isNewMPPModule: Boolean
@@ -52,6 +54,12 @@ val Module.isTestModule: Boolean
 val KotlinFacetSettings.isMPPModule: Boolean
     get() = this.mppVersion != null
 
+var Module.isKpmModule: Boolean
+        by NotNullableUserDataProperty(Key.create("IS_KPM_MODULE"), false)
+
+var Module.refinesFragmentIds: Collection<String>
+        by NotNullableUserDataProperty(Key.create("REFINES_FRAGMENT_IDS"), emptyList())
+
 private val Module.facetSettings get() = KotlinFacet.get(this)?.configuration?.settings
 
 val Module.implementingModules: List<Module>
@@ -64,7 +72,9 @@ val Module.implementingModules: List<Module>
 
         val moduleManager = ModuleManager.getInstance(project)
 
-        when (facetSettings?.mppVersion) {
+        if (isKpmModule) {
+            moduleManager.modules.filter { stableModuleName in it.refinesFragmentIds }
+        } else when (facetSettings?.mppVersion) {
             null -> emptyList()
 
             KotlinMultiplatformVersion.M3 -> {
@@ -112,27 +122,31 @@ val Module.implementedModules: List<Module>
             }
         }
 
-        val facetSettings = facetSettings
-        when (facetSettings?.mppVersion) {
-            null -> emptyList()
-
-            KotlinMultiplatformVersion.M3 -> {
-                facetSettings.dependsOnModuleNames
-                    .mapNotNull { project.modulesByLinkedKey[it] }
-                    // HACK: we do not import proper dependsOn for android source-sets in M3, so fallback to M2-impl
-                    // to at least not make things worse.
-                    // See KT-33809 for details
-                    .plus(if (isAndroidModule()) implementedModulesM2() else emptyList())
-                    .distinct()
-            }
-
-            KotlinMultiplatformVersion.M2 -> {
-                implementedModulesM2()
-            }
-
-            KotlinMultiplatformVersion.M1 -> {
-                val modelsProvider = IdeModelsProviderImpl(project)
-                findOldFashionedImplementedModuleNames().mapNotNull { modelsProvider.findIdeModule(it) }
+        if (isKpmModule) {
+            refinesFragmentIds.mapNotNull { project.modulesByLinkedKey[it] }
+        } else {
+            val facetSettings = facetSettings
+            when (facetSettings?.mppVersion) {
+                null -> emptyList()
+
+                KotlinMultiplatformVersion.M3 -> {
+                    facetSettings.dependsOnModuleNames
+                        .mapNotNull { project.modulesByLinkedKey[it] }
+                        // HACK: we do not import proper dependsOn for android source-sets in M3, so fallback to M2-impl
+                        // to at least not make things worse.
+                        // See KT-33809 for details
+                        .plus(if (isAndroidModule()) implementedModulesM2() else emptyList())
+                        .distinct()
+                }
+
+                KotlinMultiplatformVersion.M2 -> {
+                    implementedModulesM2()
+                }
+
+                KotlinMultiplatformVersion.M1 -> {
+                    val modelsProvider = IdeModelsProviderImpl(project)
+                    findOldFashionedImplementedModuleNames().mapNotNull { modelsProvider.findIdeModule(it) }
+                }
             }
         }
     }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
index 087d616f4be2..c5a3ccbb4d49 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt
@@ -3,24 +3,20 @@
 package org.jetbrains.kotlin.idea.caches.resolve
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.*
-import com.intellij.psi.impl.compiled.ClsClassImpl
-import com.intellij.psi.impl.compiled.ClsFileImpl
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.SmartList
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightClassesFactory
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.DecompiledLightClassesFactory.getLightClassForDecompiledClassOrObject
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
-import org.jetbrains.kotlin.asJava.builder.ClsWrapperStubPsiFactory
 import org.jetbrains.kotlin.asJava.classes.*
 import org.jetbrains.kotlin.config.JvmAnalysisFlags
 import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
-import org.jetbrains.kotlin.idea.caches.lightClasses.ClsJavaStubByVirtualFileCache
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.caches.lightClasses.platformMutabilityWrapper
 import org.jetbrains.kotlin.idea.caches.project.*
 import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
 import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper
 import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.project.platform
@@ -34,7 +30,6 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.utils.checkWithAttachment
 
 open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport() {
     private val psiManager: PsiManager = PsiManager.getInstance(project)
@@ -145,7 +140,7 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
                         languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode)
                     )
                 ProjectRootsUtil.isLibraryClassFile(project, virtualFile) ->
-                    return getLightClassForDecompiledClassOrObject(classOrObject)
+                    return getLightClassForDecompiledClassOrObject(classOrObject, project)
                 ProjectRootsUtil.isLibrarySourceFile(project, virtualFile) ->
                     return guardedRun {
                         SourceNavigationHelper.getOriginalClass(classOrObject) as? KtLightClass
@@ -199,7 +194,7 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
         return facadeKtFiles.mapNotNull { facadeKtFile ->
             if (facadeKtFile is KtClsFile) {
                 val partClassFile = facadeKtFile.virtualFile.parent.findChild(partClassFileShortName) ?: return@mapNotNull null
-                val javaClsClass = createClsJavaClassFromVirtualFile(facadeKtFile, partClassFile, null) ?: return@mapNotNull null
+                val javaClsClass = DecompiledLightClassesFactory.createClsJavaClassFromVirtualFile(facadeKtFile, partClassFile, null, project) ?: return@mapNotNull null
                 KtLightClassForDecompiledDeclaration(javaClsClass, javaClsClass.parent, facadeKtFile, null)
             } else {
                 // TODO should we build light classes for parts from source?
@@ -227,7 +222,7 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
         }
 
         facadeFiles.filterIsInstance<KtClsFile>().mapNotNullTo(this) {
-            createLightClassForDecompiledKotlinFile(it)
+            DecompiledLightClassesFactory.createLightClassForDecompiledKotlinFile(it, project)
         }
     }
 
@@ -256,99 +251,7 @@ open class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSu
     // the actual of order of files that resolver receives is controlled by *findFilesForFacade* method
     private fun Collection<KtFile>.platformSourcesFirst() = sortedByDescending { it.platform.isJvm() }
 
-    private fun getLightClassForDecompiledClassOrObject(decompiledClassOrObject: KtClassOrObject): KtLightClassForDecompiledDeclaration? {
-        if (decompiledClassOrObject is KtEnumEntry) {
-            return null
-        }
-        val containingKtFile = decompiledClassOrObject.containingFile as? KtClsFile ?: return null
-        val rootLightClassForDecompiledFile = createLightClassForDecompiledKotlinFile(containingKtFile) ?: return null
-
-        return findCorrespondingLightClass(decompiledClassOrObject, rootLightClassForDecompiledFile)
-    }
-
-    private fun findCorrespondingLightClass(
-        decompiledClassOrObject: KtClassOrObject,
-        rootLightClassForDecompiledFile: KtLightClassForDecompiledDeclaration
-    ): KtLightClassForDecompiledDeclaration? {
-        val relativeFqName = getClassRelativeName(decompiledClassOrObject) ?: return null
-        val iterator = relativeFqName.pathSegments().iterator()
-        val base = iterator.next()
-
-        // In case class files have been obfuscated (i.e., SomeClass belongs to a.class file), just ignore them
-        if (rootLightClassForDecompiledFile.name != base.asString()) return null
-
-        var current: KtLightClassForDecompiledDeclaration = rootLightClassForDecompiledFile
-        while (iterator.hasNext()) {
-            val name = iterator.next()
-            val innerClass = current.findInnerClassByName(name.asString(), false)
-            checkWithAttachment(
-                innerClass != null,
-                { "Could not find corresponding inner/nested class " + relativeFqName + " in class " + decompiledClassOrObject.fqName + "\nFile: " + decompiledClassOrObject.containingKtFile.virtualFile.name },
-                {
-                    it.withPsiAttachment("decompiledClassOrObject", decompiledClassOrObject)
-                    it.withAttachment("fileClass", decompiledClassOrObject.containingFile::class)
-                    it.withPsiAttachment("file", decompiledClassOrObject.containingFile)
-                    it.withPsiAttachment("root", rootLightClassForDecompiledFile)
-                },
-            )
-
-            current = innerClass as KtLightClassForDecompiledDeclaration
-        }
-        return current
-    }
-
-    private fun getClassRelativeName(decompiledClassOrObject: KtClassOrObject): FqName? {
-        val name = decompiledClassOrObject.nameAsName ?: return null
-        val parent = PsiTreeUtil.getParentOfType(
-            decompiledClassOrObject,
-            KtClassOrObject::class.java,
-            true
-        )
-        if (parent == null) {
-            assert(decompiledClassOrObject.isTopLevel())
-            return FqName.topLevel(name)
-        }
-        return getClassRelativeName(parent)?.child(name)
-    }
-
-    private fun createLightClassForDecompiledKotlinFile(file: KtClsFile): KtLightClassForDecompiledDeclaration? {
-        val virtualFile = file.virtualFile ?: return null
-
-        val classOrObject = file.declarations.filterIsInstance<KtClassOrObject>().singleOrNull()
-
-        val javaClsClass = createClsJavaClassFromVirtualFile(
-            file, virtualFile,
-            correspondingClassOrObject = classOrObject
-        ) ?: return null
-
-        return KtLightClassForDecompiledDeclaration(javaClsClass, javaClsClass.parent, file, classOrObject)
-    }
 
-    private fun createClsJavaClassFromVirtualFile(
-        mirrorFile: KtFile,
-        classFile: VirtualFile,
-        correspondingClassOrObject: KtClassOrObject?
-    ): ClsClassImpl? {
-        val javaFileStub = ClsJavaStubByVirtualFileCache.getInstance(project).get(classFile) ?: return null
-        javaFileStub.psiFactory = ClsWrapperStubPsiFactory.INSTANCE
-        val manager = PsiManager.getInstance(mirrorFile.project)
-        val fakeFile = object : ClsFileImpl(ClassFileViewProvider(manager, classFile)) {
-            override fun getNavigationElement(): PsiElement {
-                if (correspondingClassOrObject != null) {
-                    return correspondingClassOrObject.navigationElement.containingFile
-                }
-                return super.getNavigationElement()
-            }
-
-            override fun getStub() = javaFileStub
-
-            override fun getMirror() = mirrorFile
-
-            override fun isPhysical() = false
-        }
-        javaFileStub.psi = fakeFile
-        return fakeFile.classes.single() as ClsClassImpl
-    }
 }
 
 internal fun PsiElement.getModuleInfoPreferringJvmPlatform(): IdeaModuleInfo {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index b0f47a603b33..a2ba07da4f9c 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.JvmCodegenUtil
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
@@ -31,8 +30,6 @@ import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.idea.resolve.frontendService
 import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
-import org.jetbrains.kotlin.idea.util.safeAnalyzeWithContentNonSourceRootCode
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.jvm.JdkPlatform
 import org.jetbrains.kotlin.platform.subplatformsOfType
@@ -147,4 +144,4 @@ class IDELightClassGenerationSupport(project: Project) : LightClassGenerationSup
     override fun analyzeAnnotation(element: KtAnnotationEntry): AnnotationDescriptor? = element.resolveToDescriptorIfAny()
 
     override fun analyzeWithContent(element: KtClassOrObject) = element.safeAnalyzeWithContentNonSourceRootCode()
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
index 77876cb70641..67e7c1004c5e 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
@@ -80,12 +80,13 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
         if (file.isScript()) {
             // Scripts support seem to modify some of the important aspects via file user data without triggering PsiModificationTracker.
             // If in doubt, run ScriptDefinitionsOrderTestGenerated
-            return getFacadeToAnalyzeFile(file, TargetPlatformDetector.getPlatform(file))
-        }
-        else {
+            val settings = file.getModuleInfo().platformSettings(TargetPlatformDetector.getPlatform(file))
+            return getFacadeToAnalyzeFile(file, settings)
+        } else {
             return CachedValuesManager.getCachedValue(file) {
+                val settings = file.getModuleInfo().platformSettings(TargetPlatformDetector.getPlatform(file))
                 CachedValueProvider.Result(
-                    getFacadeToAnalyzeFile(file, TargetPlatformDetector.getPlatform(file)),
+                    getFacadeToAnalyzeFile(file, settings),
                     PsiModificationTracker.MODIFICATION_COUNT
                 )
             }
@@ -539,10 +540,9 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
         return getResolutionFacadeByModuleInfoAndSettings(moduleInfo, settings).createdFor(emptyList(), moduleInfo, settings)
     }
 
-    private fun getFacadeToAnalyzeFile(file: KtFile, platform: TargetPlatform): ResolutionFacade {
+    private fun getFacadeToAnalyzeFile(file: KtFile, settings: PlatformAnalysisSettings): ResolutionFacade {
         val moduleInfo = file.getModuleInfo()
         val specialFile = file.filterNotInProjectSource(moduleInfo)
-        val settings = file.getModuleInfo().platformSettings(platform)
 
         specialFile?.filterScript()?.let { script ->
             val scripts = setOf(script)
@@ -556,7 +556,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
             return ModuleResolutionFacadeImpl(projectFacade, moduleInfo).createdFor(specialFiles, moduleInfo, settings)
         }
 
-        return getResolutionFacadeByModuleInfo(moduleInfo, platform).createdFor(emptyList(), moduleInfo, settings)
+        return getResolutionFacadeByModuleInfoAndSettings(moduleInfo, settings).createdFor(emptyList(), moduleInfo, settings)
     }
 
     override fun getResolutionFacadeByFile(file: PsiFile, platform: TargetPlatform): ResolutionFacade? {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt
index 853aadb58aba..52319472be91 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/util/JavaResolveExtension.kt
@@ -5,12 +5,12 @@
 package org.jetbrains.kotlin.idea.caches.resolve.util
 
 import com.intellij.psi.*
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.caches.resolve.KotlinCacheService
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.FrontendInternals
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt
index c5e04fc3859b..9b54c117bb0b 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt
@@ -51,10 +51,10 @@ abstract class BaseKotlinCompilerSettings<T : Freezable> protected constructor(p
         }
     }
 
-    @Suppress("LeakingThis", "UNCHECKED_CAST")
-    private var _settings: T = createSettings().frozen() as T
+    @Suppress("LeakingThis")
+    private var _settings: T = createSettings().frozen()
         private set(value) {
-            field = value.frozen() as T
+            field = value.frozen()
         }
 
     var settings: T
@@ -69,8 +69,7 @@ abstract class BaseKotlinCompilerSettings<T : Freezable> protected constructor(p
         }
 
     fun update(changer: T.() -> Unit) {
-        @Suppress("UNCHECKED_CAST")
-        settings = (settings.unfrozen() as T).apply { changer() }
+        settings = settings.unfrozen().apply { changer() }
     }
 
     protected fun validateInheritedFieldsUnchanged(settings: T) {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPathsProvider.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPathsProvider.kt
new file mode 100644
index 000000000000..42acc591cf11
--- /dev/null
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPathsProvider.kt
@@ -0,0 +1,38 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.compiler.configuration
+
+import com.intellij.openapi.application.PathManager
+import com.intellij.util.io.Decompressor
+import org.jetbrains.kotlin.utils.KotlinPaths
+import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir
+import java.io.File
+
+object KotlinPathsProvider {
+    const val KOTLIN_MAVEN_GROUP_ID = "org.jetbrains.kotlin"
+    const val KOTLIN_DIST_ARTIFACT_ID = "kotlin-dist-for-ide"
+
+    fun getKotlinPaths(version: String): KotlinPaths =
+        KotlinPathsFromHomeDir(File(PathManager.getSystemPath(), KOTLIN_DIST_ARTIFACT_ID).resolve(version))
+
+    fun lazyUnpackKotlincDist(packedDist: File, version: String): File {
+        val destination = getKotlinPaths(version).homePath
+
+        val unpackedDistTimestamp = destination.lastModified()
+        val packedDistTimestamp = packedDist.lastModified()
+        if (unpackedDistTimestamp != 0L && packedDistTimestamp != 0L && unpackedDistTimestamp >= packedDistTimestamp) {
+            return destination
+        }
+        destination.deleteRecursively()
+
+        Decompressor.Zip(packedDist).extract(destination)
+        check(destination.isDirectory)
+        return destination
+    }
+
+    fun resolveKotlinMavenArtifact(mavenRepo: File, artifactId: String, version: String) =
+        mavenRepo.resolve(KOTLIN_MAVEN_GROUP_ID.replace(".", "/"))
+            .resolve(artifactId)
+            .resolve(version)
+            .resolve("$artifactId-$version.jar")
+
+}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPluginLayout.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPluginLayout.kt
new file mode 100644
index 000000000000..0497924217ec
--- /dev/null
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinPluginLayout.kt
@@ -0,0 +1,171 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.compiler.configuration
+
+import com.google.common.base.Joiner
+import com.intellij.openapi.application.PathManager
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.JDOMUtil
+import com.intellij.openapi.util.NlsSafe
+import com.intellij.util.io.URLUtil
+import com.intellij.util.io.isDirectory
+import com.intellij.util.io.isFile
+import kotlinx.coroutines.CoroutineName
+import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPathsProvider.KOTLIN_DIST_ARTIFACT_ID
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPathsProvider.KOTLIN_MAVEN_GROUP_ID
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPathsProvider.resolveKotlinMavenArtifact
+import org.jetbrains.kotlin.psi.KtElement
+import java.io.File
+import java.nio.file.Path
+import java.nio.file.Paths
+import kotlin.io.path.nameWithoutExtension
+
+sealed interface KotlinPluginLayout {
+    /**
+     * Directory with the bundled Kotlin compiler distribution. Includes the compiler itself and a set of compiler plugins
+     * with a compatible version.
+     */
+    val kotlinc: File
+
+    /**
+     * Location of the JPS plugin, compatible with the bundled Kotlin compiler distribution.
+     */
+    val jpsPluginJar: File
+
+    /**
+     * Version of the stand-alone compiler (artifacts in the 'kotlinc/' directory of the Kotlin plugin).
+     * Stand-alone compiler is always stable in 'master' and release branches. It is used for compilation with JPS.
+     */
+    val standaloneCompilerVersion: String
+        @NlsSafe get() = kotlinc.resolve("build.txt").readText().trim()
+
+    val lastStableKnownCompilerVersion: String
+        @NlsSafe get() = "1.6.10-release-952"
+
+    /**
+     * Version of the compiler's analyzer bundled into the Kotlin IDE plugin ('kotlin-compiler-for-ide' and so on).
+     * Used solely for IDE code insight. Might have a pre-release version higher than `standaloneCompilerVersion`.
+     */
+    val ideCompilerVersion: String
+        @NlsSafe get() = KotlinCompilerVersion.VERSION
+
+    companion object {
+        const val KOTLIN_JPS_PLUGIN_CLASSPATH_ARTIFACT_ID = "kotlin-jps-plugin-classpath"
+
+        @JvmStatic
+        val instance: KotlinPluginLayout by lazy {
+            val ideaDirectory = Paths.get(PathManager.getHomePath(), Project.DIRECTORY_STORE_FOLDER)
+            if (ideaDirectory.isDirectory() && !System.getProperty("idea.use.dev.build.server", "false").toBoolean()) {
+                return@lazy KotlinPluginLayoutWhenRunFromSources(ideaDirectory)
+            }
+
+            val jarInsideLib = PathManager.getJarPathForClass(KotlinPluginLayout::class.java)
+                ?.let { File(it) }
+                ?: error("Can't find jar file for ${KotlinPluginLayout::class.simpleName}")
+
+            check(jarInsideLib.extension == "jar") { "$jarInsideLib should be jar file" }
+
+            KotlinPluginLayoutWhenRunInProduction(
+                jarInsideLib
+                    .parentFile
+                    .also { check(it.name == "lib") { "$it should be lib directory" } }
+                    .parentFile
+            )
+        }
+    }
+}
+
+private class KotlinPluginLayoutWhenRunInProduction(private val kotlinPluginRoot: File) : KotlinPluginLayout {
+    init {
+        check(kotlinPluginRoot.exists()) { "$kotlinPluginRoot doesn't exist" }
+    }
+
+    override val kotlinc: File by lazy { resolve("kotlinc") }
+    override val jpsPluginJar: File by lazy { resolve("lib/jps/kotlin-jps-plugin.jar") }
+
+    private fun resolve(path: String) = kotlinPluginRoot.resolve(path).also { check(it.exists()) { "$it doesn't exist" } }
+}
+
+private class KotlinPluginLayoutWhenRunFromSources(private val ideaDirectory: Path) : KotlinPluginLayout {
+    private val bundledJpsVersion by lazy {
+        val distLibraryFile = ideaDirectory.resolve("libraries/kotlinc_kotlin_dist.xml")
+        require(distLibraryFile.isFile()) { "${distLibraryFile.nameWithoutExtension} library is not found in $ideaDirectory" }
+
+        val distLibraryElement = JDOMUtil.load(distLibraryFile).getChild("library")
+            ?: error("Can't find the 'library' element in ${distLibraryFile}")
+
+        val propertiesElement = distLibraryElement.getChild("properties")
+        if (propertiesElement != null) {
+            propertiesElement.getAttributeValue("maven-id")
+                ?.split(':')
+                ?.takeIf { it.size == 3 }
+                ?.last()
+                ?: error("${distLibraryFile} is not a valid Maven library")
+        } else {
+            // In cooperative mode, Kotlin compiler artifacts are not Maven libraries
+            val rootUrl = distLibraryElement.getChild("CLASSES")?.getChild("root")
+                ?.getAttributeValue("url")
+                ?: error("Can't find a valid 'CLASSES' root in ${distLibraryFile}")
+
+            val rootPath = URLUtil.splitJarUrl(rootUrl)?.first ?: error("Root URL (${rootUrl}) is not a valid JAR URL")
+            val rootPathChunks = rootPath.split('/').asReversed()
+            check(rootPathChunks.size > 3 && rootPathChunks[0].startsWith(rootPathChunks[2] + "-" + rootPathChunks[1])) {
+                "Unsupported root path, expected a path inside a Maven repository: $rootPathChunks"
+            }
+
+            rootPathChunks[1] // artifact version
+        }
+    }
+
+    private fun getRepositoryPath(clazz: Class<*>, groupId: String): File {
+        val artifactFile = PathManager.getJarPathForClass(clazz)?.let { File(it) }
+            ?: error("Can't find kotlin-stdlib.jar in Maven Local")
+
+        fun resolutionFailed(): Nothing = error("Maven repository not found for artifact '$artifactFile'")
+
+        val versionDir = artifactFile.parentFile
+        val artifactDir = versionDir?.parentFile
+        val artifactGroupDir = artifactDir?.parentFile
+
+        if (artifactGroupDir == null || !artifactFile.name.startsWith(artifactDir.name + "-" + versionDir.name)) {
+            resolutionFailed()
+        }
+
+        return groupId.split('.').asReversed().fold(artifactGroupDir) { dir, chunk ->
+            check(dir.name == chunk)
+            dir.parentFile ?: resolutionFailed()
+        }
+    }
+
+    /**
+     * Local Maven repository with unstable Kotlin compiler artifacts.
+     * For 'master' and release branches (e.g. '221') it will likely point to '~/.m2'.
+     * For kt-branches (such as 'kt-master'), it points to a repository inside the compiler build directory (../build/repo).
+     */
+    private val kotlinArtifactRepositoryDir: File by lazy { getRepositoryPath(KtElement::class.java, KOTLIN_MAVEN_GROUP_ID) }
+
+    /**
+     * Local Maven repository for IntelliJ IDEA dependencies. Likely points to '~/.m2'.
+     * Note that 'ideaArtifactRepositoryDir' can contain stable versions of Kotlin compiler artifacts.
+     */
+    private val ideaArtifactRepositoryDir: File by lazy { getRepositoryPath(CoroutineName::class.java, "org.jetbrains.kotlinx") }
+
+    private fun resolveKotlinArtifact(artifactId: String): File {
+        val artifacts = sequence {
+            yield(resolveKotlinMavenArtifact(kotlinArtifactRepositoryDir, artifactId, bundledJpsVersion))
+            yield(resolveKotlinMavenArtifact(ideaArtifactRepositoryDir, artifactId, bundledJpsVersion))
+        }
+
+        return artifacts.filter { it.exists() }.firstOrNull()
+            ?: error("Can't find artifact '$KOTLIN_MAVEN_GROUP_ID:$artifactId:$bundledJpsVersion' in Maven Local")
+    }
+
+    override val kotlinc: File by lazy {
+        val distArtifact = resolveKotlinArtifact(KOTLIN_DIST_ARTIFACT_ID)
+        KotlinPathsProvider.lazyUnpackKotlincDist(distArtifact, bundledJpsVersion)
+    }
+
+    override val jpsPluginJar: File by lazy {
+        resolveKotlinArtifact(KotlinPluginLayout.KOTLIN_JPS_PLUGIN_CLASSPATH_ARTIFACT_ID)
+    }
+}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinDecompiledFileViewProvider.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinDecompiledFileViewProvider.kt
deleted file mode 100644
index 4401b56ca4be..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinDecompiledFileViewProvider.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler
-
-import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiInvalidElementAccessException
-import com.intellij.psi.PsiManager
-import com.intellij.psi.SingleRootFileViewProvider
-import com.intellij.psi.impl.DebugUtil
-import com.intellij.psi.impl.source.PsiFileImpl
-import org.jetbrains.kotlin.idea.KotlinFileType
-import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
-
-class KotlinDecompiledFileViewProvider(
-    manager: PsiManager,
-    file: VirtualFile,
-    physical: Boolean,
-    private val factory: (KotlinDecompiledFileViewProvider) -> KtDecompiledFile?
-) : SingleRootFileViewProvider(manager, file, physical, KotlinLanguage.INSTANCE) {
-    val content: LockedClearableLazyValue<String> = LockedClearableLazyValue(Any()) {
-        val psiFile = createFile(manager.project, file, KotlinFileType.INSTANCE)
-        val text = psiFile?.text ?: ""
-
-        DebugUtil.performPsiModification<PsiInvalidElementAccessException>("Invalidating throw-away copy of file that was used for getting text") {
-            (psiFile as? PsiFileImpl)?.markInvalidated()
-        }
-
-        text
-    }
-
-    override fun createFile(project: Project, file: VirtualFile, fileType: FileType): PsiFile? {
-        return factory(this)
-    }
-
-    override fun createCopy(copy: VirtualFile) = KotlinDecompiledFileViewProvider(manager, copy, false, factory)
-
-    override fun getContents() = content.get()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
deleted file mode 100644
index bbe2dcdab06a..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/KtDecompiledFile.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler
-
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.util.PsiTreeUtil
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndexer
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
-
-open class KtDecompiledFile(
-    private val provider: KotlinDecompiledFileViewProvider,
-    buildDecompiledText: (VirtualFile) -> DecompiledText
-) : KtFile(provider, true) {
-
-    private val decompiledText = LockedClearableLazyValue(Any()) {
-        buildDecompiledText(provider.virtualFile)
-    }
-
-    override fun getText(): String? {
-        return decompiledText.get().text
-    }
-
-    override fun onContentReload() {
-        super.onContentReload()
-
-        provider.content.drop()
-        decompiledText.drop()
-    }
-
-    fun <T : Any> getDeclaration(indexer: DecompiledTextIndexer<T>, key: T): KtDeclaration? {
-        val range = decompiledText.get().index.getRange(indexer, key) ?: return null
-        return PsiTreeUtil.findElementOfClassAtRange(this@KtDecompiledFile, range.startOffset, range.endOffset, KtDeclaration::class.java)
-    }
-
-    fun <T : Any> hasDeclarationWithKey(indexer: DecompiledTextIndexer<T>, key: T): Boolean {
-        return decompiledText.get().index.getRange(indexer, key) != null
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
deleted file mode 100644
index 6c6300da29c7..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.builtIns
-
-import com.intellij.ide.highlighter.JavaClassFileType
-import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata
-import org.jetbrains.kotlin.idea.decompiler.common.KotlinMetadataDecompiler
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
-import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
-import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import java.io.ByteArrayInputStream
-
-class KotlinBuiltInDecompiler : KotlinMetadataDecompiler<BuiltInsBinaryVersion>(
-    KotlinBuiltInFileType, { BuiltInSerializerProtocol },
-    FlexibleTypeDeserializer.ThrowException, { BuiltInsBinaryVersion.INSTANCE }, { BuiltInsBinaryVersion.INVALID_VERSION },
-    KotlinStubVersions.BUILTIN_STUB_VERSION
-) {
-    override fun readFile(bytes: ByteArray, file: VirtualFile): FileWithMetadata? {
-        return BuiltInDefinitionFile.read(bytes, file)
-    }
-}
-
-class BuiltInDefinitionFile(
-    proto: ProtoBuf.PackageFragment,
-    version: BuiltInsBinaryVersion,
-    val packageDirectory: VirtualFile,
-    val isMetadata: Boolean
-) : FileWithMetadata.Compatible(proto, version, BuiltInSerializerProtocol) {
-    override val classesToDecompile: List<ProtoBuf.Class>
-        get() = super.classesToDecompile.let { classes ->
-            if (isMetadata || !FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES) classes
-            else classes.filter { classProto ->
-                shouldDecompileBuiltInClass(nameResolver.getClassId(classProto.fqName))
-            }
-        }
-
-    private fun shouldDecompileBuiltInClass(classId: ClassId): Boolean {
-        val realJvmClassFileName = classId.shortClassName.asString() + "." + JavaClassFileType.INSTANCE.defaultExtension
-        return packageDirectory.findChild(realJvmClassFileName) == null
-    }
-
-    companion object {
-        var FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES = true
-            @TestOnly set
-
-        fun read(contents: ByteArray, file: VirtualFile): FileWithMetadata? {
-            val stream = ByteArrayInputStream(contents)
-
-            val version = BuiltInsBinaryVersion.readFrom(stream)
-            if (!version.isCompatible()) {
-                return Incompatible(version)
-            }
-
-            val proto = ProtoBuf.PackageFragment.parseFrom(stream, BuiltInSerializerProtocol.extensionRegistry)
-            val result =
-                BuiltInDefinitionFile(proto, version, file.parent, file.extension == MetadataPackageFragment.METADATA_FILE_EXTENSION)
-            val packageProto = result.proto.`package`
-            if (result.classesToDecompile.isEmpty() &&
-                packageProto.typeAliasCount == 0 && packageProto.functionCount == 0 && packageProto.propertyCount == 0
-            ) {
-                // No declarations to decompile: should skip this file
-                return null
-            }
-
-            return result
-        }
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInFileType.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInFileType.kt
deleted file mode 100644
index 91e72ce06da4..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInFileType.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.builtIns
-
-import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.idea.KotlinIcons
-import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle
-import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
-
-object KotlinBuiltInFileType : FileType {
-    override fun getName() = "kotlin_builtins"
-
-    override fun getDescription() = KotlinIdeaAnalysisBundle.message("kotlin.built.in.declarations")
-
-    override fun getDefaultExtension() = BuiltInSerializerProtocol.BUILTINS_FILE_EXTENSION
-
-    override fun getIcon() = KotlinIcons.FILE
-
-    override fun isBinary() = true
-
-    override fun isReadOnly() = true
-
-    override fun getCharset(file: VirtualFile, content: ByteArray) = null
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinSyntaxHighlighterProviderForDecompiledBuiltIns.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinSyntaxHighlighterProviderForDecompiledBuiltIns.kt
index fb9fcc6a6afb..3af4a345e186 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinSyntaxHighlighterProviderForDecompiledBuiltIns.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinSyntaxHighlighterProviderForDecompiledBuiltIns.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighter
 import com.intellij.openapi.fileTypes.SyntaxHighlighterProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlighter
 
 class KotlinSyntaxHighlighterProviderForDecompiledBuiltIns : SyntaxHighlighterProvider {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/ClassFileDecompilerUtil.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/ClassFileDecompilerUtil.kt
deleted file mode 100644
index 11daf4475855..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/ClassFileDecompilerUtil.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.classFile
-
-import com.intellij.openapi.components.serviceOrNull
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.Key
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.ClassFileViewProvider
-import org.jetbrains.kotlin.idea.caches.FileAttributeService
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
-import org.jetbrains.kotlin.load.kotlin.findKotlinClass
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.Name
-
-data class IsKotlinBinary(val isKotlinBinary: Boolean, val timestamp: Long)
-
-val KOTLIN_COMPILED_FILE_ATTRIBUTE: String = "kotlin-compiled-file".apply {
-    serviceOrNull<FileAttributeService>()?.register(this, 1)
-}
-
-val KEY = Key.create<IsKotlinBinary>(KOTLIN_COMPILED_FILE_ATTRIBUTE)
-
-/**
- * Checks if this file is a compiled Kotlin class file ABI-compatible with the current plugin
- */
-fun isKotlinWithCompatibleAbiVersion(file: VirtualFile): Boolean {
-    val ideKotlinBinaryClassCache = IDEKotlinBinaryClassCache.getInstance()
-    if (!ideKotlinBinaryClassCache.isKotlinJvmCompiledFile(file)) return false
-
-    val kotlinClass = ideKotlinBinaryClassCache.getKotlinBinaryClassHeaderData(file)
-    return kotlinClass != null && kotlinClass.metadataVersion.isCompatible()
-}
-
-/**
- * Checks if this file is a compiled "internal" Kotlin class, i.e. a Kotlin class (not necessarily ABI-compatible with the current plugin)
- * which should NOT be decompiled (and, as a result, shown under the library in the Project view, be searchable via Find class, etc.)
- */
-fun isKotlinInternalCompiledFile(file: VirtualFile, fileContent: ByteArray? = null): Boolean {
-    // Don't crash on invalid files (EA-97751)
-    if (!file.isValid || fileContent?.size == 0 || !file.exists()) {
-        return false
-    }
-
-    val ideKotlinBinaryClassCache = IDEKotlinBinaryClassCache.getInstance()
-
-    if (!ideKotlinBinaryClassCache.isKotlinJvmCompiledFile(file, fileContent)) {
-        return false
-    }
-
-    val innerClass =
-        try {
-            if (fileContent == null) {
-                ClassFileViewProvider.isInnerClass(file)
-            } else {
-                ClassFileViewProvider.isInnerClass(file, fileContent)
-            }
-        } catch (exception: Exception) {
-            Logger
-                .getInstance("org.jetbrains.kotlin.idea.decompiler.classFile.isKotlinInternalCompiledFile")
-                .debug(file.path, exception)
-
-            return false
-        }
-
-    if (innerClass) {
-        return true
-    }
-
-    val header = ideKotlinBinaryClassCache.getKotlinBinaryClassHeaderData(file, fileContent) ?: return false
-    if (header.classId.isLocal) return true
-
-    return header.kind == KotlinClassHeader.Kind.SYNTHETIC_CLASS ||
-            header.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART
-}
-
-fun findMultifileClassParts(file: VirtualFile, classId: ClassId, partNames: List<String>): List<KotlinJvmBinaryClass> {
-    val packageFqName = classId.packageFqName
-    val partsFinder = DirectoryBasedClassFinder(file.parent!!, packageFqName)
-
-    return partNames.mapNotNull {
-        partsFinder.findKotlinClass(ClassId(packageFqName, Name.identifier(it.substringAfterLast('/'))))
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/DeserializerForClassfileDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/DeserializerForClassfileDecompiler.kt
deleted file mode 100644
index cc30bfb78ad6..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/DeserializerForClassfileDecompiler.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.classFile
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.builtins.DefaultBuiltIns
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.contracts.ContractDeserializerImpl
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.descriptors.NotFoundClasses
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompilerBase
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotlinAnyLocalClassifierResolver
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.load.java.structure.JavaClass
-import org.jetbrains.kotlin.load.java.structure.classId
-import org.jetbrains.kotlin.load.kotlin.*
-import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder.Result.KotlinClass
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.resolve.sam.SamConversionResolverImpl
-import org.jetbrains.kotlin.serialization.deserialization.ClassData
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-import java.io.InputStream
-
-fun DeserializerForClassfileDecompiler(classFile: VirtualFile): DeserializerForClassfileDecompiler {
-    val kotlinClassHeaderInfo =
-        IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(classFile)
-            ?: error("Decompiled data factory shouldn't be called on an unsupported file: $classFile")
-    val packageFqName = kotlinClassHeaderInfo.classId.packageFqName
-    return DeserializerForClassfileDecompiler(classFile.parent!!, packageFqName)
-}
-
-class DeserializerForClassfileDecompiler(
-    packageDirectory: VirtualFile,
-    directoryPackageFqName: FqName
-) : DeserializerForDecompilerBase(directoryPackageFqName) {
-    override val builtIns: KotlinBuiltIns get() = DefaultBuiltIns.Instance
-
-    private val classFinder = DirectoryBasedClassFinder(packageDirectory, directoryPackageFqName)
-
-    override val deserializationComponents: DeserializationComponents
-
-    init {
-        val classDataFinder = DirectoryBasedDataFinder(classFinder, LOG)
-        val notFoundClasses = NotFoundClasses(storageManager, moduleDescriptor)
-        val annotationAndConstantLoader =
-            BinaryClassAnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, storageManager, classFinder)
-
-        val configuration = object : DeserializationConfiguration {
-            override val readDeserializedContracts: Boolean = true
-            override val preserveDeclarationsOrdering: Boolean = true
-        }
-
-        deserializationComponents = DeserializationComponents(
-            storageManager, moduleDescriptor, configuration, classDataFinder, annotationAndConstantLoader,
-            packageFragmentProvider, ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), LoggingErrorReporter(LOG),
-            LookupTracker.DO_NOTHING, JavaFlexibleTypeDeserializer, emptyList(), notFoundClasses,
-            ContractDeserializerImpl(configuration, storageManager),
-            extensionRegistryLite = JvmProtoBufUtil.EXTENSION_REGISTRY,
-            samConversionResolver = SamConversionResolverImpl(storageManager, samWithReceiverResolvers = emptyList())
-        )
-    }
-
-    override fun resolveDeclarationsInFacade(facadeFqName: FqName): List<DeclarationDescriptor> {
-        val packageFqName = facadeFqName.parent()
-        assert(packageFqName == directoryPackageFqName) {
-            "Was called for $facadeFqName; only members of $directoryPackageFqName package are expected."
-        }
-        val binaryClassForPackageClass = classFinder.findKotlinClass(ClassId.topLevel(facadeFqName))
-        val header = binaryClassForPackageClass?.classHeader
-        val annotationData = header?.data
-        val strings = header?.strings
-        if (annotationData == null || strings == null) {
-            LOG.error("Could not read annotation data for $facadeFqName from ${binaryClassForPackageClass?.classId}")
-            return emptyList()
-        }
-        val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(annotationData, strings)
-        val dummyPackageFragment = createDummyPackageFragment(header.packageName?.let(::FqName) ?: facadeFqName.parent())
-        val membersScope = DeserializedPackageMemberScope(
-            dummyPackageFragment,
-            packageProto, nameResolver, header.metadataVersion,
-            JvmPackagePartSource(binaryClassForPackageClass, packageProto, nameResolver), deserializationComponents,
-            "scope of dummyPackageFragment ${dummyPackageFragment.fqName} in module $moduleDescriptor @DeserializerForClassfileDecompiler"
-        ) { emptyList() }
-        return membersScope.getContributedDescriptors().toList()
-    }
-
-    companion object {
-        private val LOG = Logger.getInstance(DeserializerForClassfileDecompiler::class.java)
-    }
-}
-
-class DirectoryBasedClassFinder(
-    val packageDirectory: VirtualFile,
-    val directoryPackageFqName: FqName
-) : KotlinClassFinder {
-    override fun findKotlinClassOrContent(javaClass: JavaClass) = findKotlinClassOrContent(javaClass.classId!!)
-
-    override fun findKotlinClassOrContent(classId: ClassId): KotlinClassFinder.Result? {
-        if (classId.packageFqName != directoryPackageFqName) {
-            return null
-        }
-        val targetName = classId.relativeClassName.pathSegments().joinToString("$", postfix = ".class")
-        val virtualFile = packageDirectory.findChild(targetName)
-        if (virtualFile != null && isKotlinWithCompatibleAbiVersion(virtualFile)) {
-            return IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClass(virtualFile)?.let(::KotlinClass)
-        }
-        return null
-    }
-
-    // TODO
-    override fun findMetadata(classId: ClassId): InputStream? = null
-
-    // TODO
-    override fun hasMetadataPackage(fqName: FqName): Boolean = false
-
-    // TODO: load built-ins from packageDirectory?
-    override fun findBuiltInsData(packageFqName: FqName): InputStream? = null
-}
-
-class DirectoryBasedDataFinder(
-    val classFinder: DirectoryBasedClassFinder,
-    val log: Logger
-) : ClassDataFinder {
-    override fun findClassData(classId: ClassId): ClassData? {
-        val binaryClass = classFinder.findKotlinClass(classId) ?: return null
-        val classHeader = binaryClass.classHeader
-        val data = classHeader.data
-        if (data == null) {
-            log.error("Annotation data missing for ${binaryClass.classId}")
-            return null
-        }
-        val strings = classHeader.strings
-        if (strings == null) {
-            log.error("String table not found in class ${binaryClass.classId}")
-            return null
-        }
-
-        val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(data, strings)
-        return ClassData(nameResolver, classProto, classHeader.metadataVersion, KotlinJvmBinarySourceElement(binaryClass))
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClassFileDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClassFileDecompiler.kt
deleted file mode 100644
index bfc9a3017481..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClassFileDecompiler.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.classFile
-
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.PsiManager
-import com.intellij.psi.compiled.ClassFileDecompilers
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.idea.caches.lightClasses.BySignatureIndexer
-import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
-import org.jetbrains.kotlin.idea.decompiler.common.createIncompatibleAbiVersionDecompiledText
-import org.jetbrains.kotlin.idea.decompiler.navigation.ByDescriptorIndexer
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolverForDecompiler
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.types.asFlexibleType
-import org.jetbrains.kotlin.types.isFlexible
-
-class KotlinClassFileDecompiler : ClassFileDecompilers.Full() {
-    private val stubBuilder = KotlinClsStubBuilder()
-
-    override fun accepts(file: VirtualFile) = IDEKotlinBinaryClassCache.getInstance().isKotlinJvmCompiledFile(file)
-
-    override fun getStubBuilder() = stubBuilder
-
-    override fun createFileViewProvider(file: VirtualFile, manager: PsiManager, physical: Boolean): KotlinDecompiledFileViewProvider {
-        return KotlinDecompiledFileViewProvider(manager, file, physical) factory@{ provider ->
-            val virtualFile = provider.virtualFile
-
-            if (isKotlinInternalCompiledFile(virtualFile))
-                null
-            else
-                KtClsFile(provider)
-        }
-    }
-}
-
-class KtClsFile(provider: KotlinDecompiledFileViewProvider) : KtDecompiledFile(provider, { file -> buildDecompiledTextForClassFile(file) })
-
-private val decompilerRendererForClassFiles = DescriptorRenderer.withOptions {
-    defaultDecompilerRendererOptions()
-    typeNormalizer = { type -> if (type.isFlexible()) type.asFlexibleType().lowerBound else type }
-}
-
-fun buildDecompiledTextForClassFile(
-    classFile: VirtualFile,
-    resolver: ResolverForDecompiler = DeserializerForClassfileDecompiler(classFile)
-): DecompiledText {
-    val classHeader =
-        IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(classFile)
-            ?: error("Decompiled data factory shouldn't be called on an unsupported file: $classFile")
-
-    val classId = classHeader.classId
-
-    if (!classHeader.metadataVersion.isCompatible()) {
-        return createIncompatibleAbiVersionDecompiledText(JvmMetadataVersion.INSTANCE, classHeader.metadataVersion)
-    }
-
-    fun buildText(declarations: List<DeclarationDescriptor>) = buildDecompiledText(
-        classHeader.packageName?.let(::FqName) ?: classId.packageFqName,
-        declarations, decompilerRendererForClassFiles, listOf(ByDescriptorIndexer, BySignatureIndexer)
-    )
-
-    return when (classHeader.kind) {
-        KotlinClassHeader.Kind.FILE_FACADE ->
-            buildText(resolver.resolveDeclarationsInFacade(classId.asSingleFqName()))
-        KotlinClassHeader.Kind.CLASS -> {
-            buildText(listOfNotNull(resolver.resolveTopLevelClass(classId)))
-        }
-        KotlinClassHeader.Kind.MULTIFILE_CLASS -> {
-            val partClasses = findMultifileClassParts(classFile, classId, classHeader.partNamesIfMultifileFacade)
-            val partMembers = partClasses.flatMap { partClass ->
-                resolver.resolveDeclarationsInFacade(partClass.classId.asSingleFqName())
-            }
-            buildText(partMembers)
-        }
-        else ->
-            throw UnsupportedOperationException("Unknown header kind: $classHeader, class $classId")
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
deleted file mode 100644
index b8032215faeb..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.classFile
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.compiled.ClsStubBuilder
-import com.intellij.psi.impl.compiled.ClassFileStubBuilder
-import com.intellij.psi.stubs.PsiFileStub
-import com.intellij.util.indexing.FileContent
-import org.jetbrains.kotlin.SpecialJvmAnnotations
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.*
-import org.jetbrains.kotlin.load.kotlin.*
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
-import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue
-import org.jetbrains.kotlin.resolve.constants.ConstantValue
-import org.jetbrains.kotlin.resolve.constants.KClassValue
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-
-open class KotlinClsStubBuilder : ClsStubBuilder() {
-    override fun getStubVersion() = ClassFileStubBuilder.STUB_VERSION + KotlinStubVersions.CLASSFILE_STUB_VERSION
-
-    override fun buildFileStub(content: FileContent): PsiFileStub<*>? {
-        val virtualFile = content.file
-
-        if (isKotlinInternalCompiledFile(virtualFile, content.content)) {
-            return null
-        }
-
-        if (isVersioned(virtualFile)) {
-            // Kotlin can't build stubs for versioned class files, because list of versioned inner classes
-            // might be incomplete
-            return null
-        }
-
-        return doBuildFileStub(virtualFile, content.content)
-    }
-
-    private fun doBuildFileStub(file: VirtualFile, fileContent: ByteArray): PsiFileStub<KtFile>? {
-        val kotlinClass = IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClass(file, fileContent)
-            ?: error("Can't find binary class for Kotlin file: $file")
-        val header = kotlinClass.classHeader
-        val classId = kotlinClass.classId
-        val packageFqName = header.packageName?.let { FqName(it) } ?: classId.packageFqName
-
-        if (!header.metadataVersion.isCompatible()) {
-            return createIncompatibleAbiVersionFileStub()
-        }
-
-        val components = createStubBuilderComponents(file, packageFqName, fileContent)
-        if (header.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS) {
-            val partFiles = findMultifileClassParts(file, classId, header.multifilePartNames)
-            return createMultifileClassStub(header, partFiles, classId.asSingleFqName(), components)
-        }
-
-        val annotationData = header.data
-        if (annotationData == null) {
-            LOG.error("Corrupted kotlin header for file ${file.name}")
-            return null
-        }
-        val strings = header.strings
-        if (strings == null) {
-            LOG.error("String table not found in file ${file.name}")
-            return null
-        }
-        return when (header.kind) {
-            KotlinClassHeader.Kind.CLASS -> {
-                if (classId.isLocal) return null
-                val (nameResolver, classProto) = JvmProtoBufUtil.readClassDataFrom(annotationData, strings)
-                if (Flags.VISIBILITY.get(classProto.flags) == ProtoBuf.Visibility.LOCAL) {
-                    // Older Kotlin compiler versions didn't put 'INNERCLASS' attributes in some cases (e.g. for cross-inline lambdas),
-                    // so 'ClassFileViewProvider.isInnerClass()' pre-check won't find them (EA-105730).
-                    // Example: `Timer().schedule(1000) { foo () }`.
-                    return null
-                }
-
-                val context = components.createContext(nameResolver, packageFqName, TypeTable(classProto.typeTable))
-                createTopLevelClassStub(classId, classProto, KotlinJvmBinarySourceElement(kotlinClass), context, header.isScript)
-            }
-            KotlinClassHeader.Kind.FILE_FACADE -> {
-                val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(annotationData, strings)
-                val context = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
-                val fqName = header.packageName?.let { ClassId(FqName(it), classId.relativeClassName, classId.isLocal).asSingleFqName() }
-                    ?: classId.asSingleFqName()
-                createFileFacadeStub(packageProto, fqName, context)
-            }
-            else -> throw IllegalStateException("Should have processed " + file.path + " with header $header")
-        }
-    }
-
-    private fun createStubBuilderComponents(file: VirtualFile, packageFqName: FqName, fileContent: ByteArray): ClsStubBuilderComponents {
-        val classFinder = DirectoryBasedClassFinder(file.parent!!, packageFqName)
-        val classDataFinder = DirectoryBasedDataFinder(classFinder, LOG)
-        val annotationLoader = AnnotationLoaderForClassFileStubBuilder(classFinder, file, fileContent)
-        return ClsStubBuilderComponents(classDataFinder, annotationLoader, file)
-    }
-
-    companion object {
-        val LOG = Logger.getInstance(KotlinClsStubBuilder::class.java)
-
-        // Archive separator + META-INF + versions
-        private val VERSIONED_PATH_MARKER = "!/META-INF/versions/"
-
-        fun isVersioned(virtualFile: VirtualFile): Boolean {
-            return virtualFile.path.contains(VERSIONED_PATH_MARKER)
-        }
-    }
-}
-
-class AnnotationLoaderForClassFileStubBuilder(
-    kotlinClassFinder: KotlinClassFinder,
-    private val cachedFile: VirtualFile,
-    private val cachedFileContent: ByteArray
-) : AbstractBinaryClassAnnotationAndConstantLoader<ClassId, Unit>(LockBasedStorageManager.NO_LOCKS, kotlinClassFinder) {
-
-    override fun getCachedFileContent(kotlinClass: KotlinJvmBinaryClass): ByteArray? {
-        if ((kotlinClass as? VirtualFileKotlinClass)?.file == cachedFile) {
-            return cachedFileContent
-        }
-        return null
-    }
-
-    override fun loadTypeAnnotation(proto: ProtoBuf.Annotation, nameResolver: NameResolver): ClassId = nameResolver.getClassId(proto.id)
-
-    override fun loadConstant(desc: String, initializer: Any) = null
-
-    override fun transformToUnsignedConstant(constant: Unit) = null
-
-    override fun loadAnnotation(
-        annotationClassId: ClassId, source: SourceElement, result: MutableList<ClassId>
-    ): KotlinJvmBinaryClass.AnnotationArgumentVisitor? {
-        if (annotationClassId != SpecialJvmAnnotations.JAVA_LANG_ANNOTATION_REPEATABLE) {
-            result += annotationClassId
-            return null
-        }
-
-        return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor {
-            private val arguments = mutableMapOf<Name, ConstantValue<*>>()
-            override fun visitClassLiteral(name: Name?, value: ClassLiteralValue) {
-                if (name != null)
-                    arguments[name] = KClassValue(value)
-            }
-
-            override fun visitEnd() {
-                if (!isRepeatableWithImplicitContainer(annotationClassId, arguments)) {
-                    result.add(annotationClassId)
-                }
-            }
-
-            override fun visit(name: Name?, value: Any?) = Unit
-            override fun visitEnum(name: Name?, enumClassId: ClassId, enumEntryName: Name) = Unit
-            override fun visitArray(name: Name?): KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor? = null
-            override fun visitAnnotation(name: Name?, classId: ClassId): KotlinJvmBinaryClass.AnnotationArgumentVisitor? = null
-        }
-    }
-
-    override fun loadAnnotationMethodDefaultValue(
-        annotationClass: KotlinJvmBinaryClass,
-        methodSignature: MemberSignature,
-        visitResult: (Unit) -> Unit
-    ): KotlinJvmBinaryClass.AnnotationArgumentVisitor? = null
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt
deleted file mode 100644
index ccd180ce5a04..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.common
-
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
-import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.types.KotlinType
-
-class AnnotationLoaderForStubBuilderImpl(
-    private val protocol: SerializerExtensionProtocol
-) : AnnotationAndConstantLoader<ClassId, Unit> {
-
-    override fun loadClassAnnotations(container: ProtoContainer.Class): List<ClassId> =
-        container.classProto.getExtension(protocol.classAnnotation).orEmpty().map { container.nameResolver.getClassId(it.id) }
-
-    override fun loadCallableAnnotations(
-        container: ProtoContainer,
-        proto: MessageLite,
-        kind: AnnotatedCallableKind
-    ): List<ClassId> {
-        val annotations = when (proto) {
-            is ProtoBuf.Constructor -> proto.getExtension(protocol.constructorAnnotation)
-            is ProtoBuf.Function -> proto.getExtension(protocol.functionAnnotation)
-            is ProtoBuf.Property -> when (kind) {
-                AnnotatedCallableKind.PROPERTY -> proto.getExtension(protocol.propertyAnnotation)
-                AnnotatedCallableKind.PROPERTY_GETTER -> proto.getExtension(protocol.propertyGetterAnnotation)
-                AnnotatedCallableKind.PROPERTY_SETTER -> proto.getExtension(protocol.propertySetterAnnotation)
-                else -> error("Unsupported callable kind with property proto")
-            }
-            else -> error("Unknown message: $proto")
-        }.orEmpty()
-        return annotations.map { container.nameResolver.getClassId(it.id) }
-    }
-
-    override fun loadPropertyBackingFieldAnnotations(container: ProtoContainer, proto: ProtoBuf.Property): List<ClassId> =
-        emptyList()
-
-    override fun loadPropertyDelegateFieldAnnotations(container: ProtoContainer, proto: ProtoBuf.Property): List<ClassId> =
-        emptyList()
-
-    override fun loadEnumEntryAnnotations(container: ProtoContainer, proto: ProtoBuf.EnumEntry): List<ClassId> =
-        proto.getExtension(protocol.enumEntryAnnotation).orEmpty().map { container.nameResolver.getClassId(it.id) }
-
-    override fun loadValueParameterAnnotations(
-        container: ProtoContainer,
-        callableProto: MessageLite,
-        kind: AnnotatedCallableKind,
-        parameterIndex: Int,
-        proto: ProtoBuf.ValueParameter
-    ): List<ClassId> =
-        proto.getExtension(protocol.parameterAnnotation).orEmpty().map { container.nameResolver.getClassId(it.id) }
-
-    override fun loadExtensionReceiverParameterAnnotations(
-        container: ProtoContainer,
-        proto: MessageLite,
-        kind: AnnotatedCallableKind
-    ): List<ClassId> = emptyList()
-
-    override fun loadTypeAnnotations(
-        proto: ProtoBuf.Type,
-        nameResolver: NameResolver
-    ): List<ClassId> =
-        proto.getExtension(protocol.typeAnnotation).orEmpty().map { nameResolver.getClassId(it.id) }
-
-    override fun loadTypeParameterAnnotations(proto: ProtoBuf.TypeParameter, nameResolver: NameResolver): List<ClassId> =
-        proto.getExtension(protocol.typeParameterAnnotation).orEmpty().map { nameResolver.getClassId(it.id) }
-
-    override fun loadPropertyConstant(
-        container: ProtoContainer,
-        proto: ProtoBuf.Property,
-        expectedType: KotlinType
-    ) {
-    }
-
-    override fun loadAnnotationDefaultValue(container: ProtoContainer, proto: ProtoBuf.Property, expectedType: KotlinType): Unit? = null
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt
deleted file mode 100644
index ae7199d79aac..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.common
-
-import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.FileViewProvider
-import com.intellij.psi.PsiManager
-import com.intellij.psi.compiled.ClassFileDecompilers
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
-import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.utils.addIfNotNull
-import java.io.IOException
-
-abstract class KotlinMetadataDecompiler<out V : BinaryVersion>(
-    private val fileType: FileType,
-    private val serializerProtocol: () -> SerializerExtensionProtocol,
-    private val flexibleTypeDeserializer: FlexibleTypeDeserializer,
-    private val expectedBinaryVersion: () -> V,
-    private val invalidBinaryVersion: () -> V,
-    stubVersion: Int
-) : ClassFileDecompilers.Full() {
-    private val metadataStubBuilder: KotlinMetadataStubBuilder =
-        KotlinMetadataStubBuilder(stubVersion, fileType, serializerProtocol, ::readFileSafely)
-
-    private val renderer: DescriptorRenderer by lazy {
-        DescriptorRenderer.withOptions { defaultDecompilerRendererOptions() }
-    }
-
-    abstract fun readFile(bytes: ByteArray, file: VirtualFile): FileWithMetadata?
-
-    override fun accepts(file: VirtualFile) = file.fileType == fileType
-
-    override fun getStubBuilder() = metadataStubBuilder
-
-    override fun createFileViewProvider(file: VirtualFile, manager: PsiManager, physical: Boolean): FileViewProvider {
-        return KotlinDecompiledFileViewProvider(manager, file, physical) { provider ->
-            val virtualFile = provider.virtualFile
-            readFileSafely(virtualFile)?.let { fileWithMetadata ->
-                KtDecompiledFile(provider) {
-                    check(it == virtualFile) {
-                        "Unexpected file $it, expected ${virtualFile.fileType}"
-                    }
-                    buildDecompiledText(fileWithMetadata)
-                }
-            }
-        }
-    }
-
-    @TestOnly
-    fun readFile(file: VirtualFile) = readFileSafely(file)
-
-    private fun readFileSafely(file: VirtualFile, content: ByteArray? = null): FileWithMetadata? {
-        if (!file.isValid) return null
-
-        return try {
-            readFile(content ?: file.contentsToByteArray(false), file)
-        } catch (e: IOException) {
-            // This is needed because sometimes we're given VirtualFile instances that point to non-existent .jar entries.
-            // Such files are valid (isValid() returns true), but an attempt to read their contents results in a FileNotFoundException.
-            // Note that although calling "refresh()" instead of catching an exception would seem more correct here,
-            // it's not always allowed and also is likely to degrade performance
-            null
-        }
-    }
-
-    private fun buildDecompiledText(file: FileWithMetadata): DecompiledText {
-        return when (file) {
-            is FileWithMetadata.Incompatible -> {
-                createIncompatibleAbiVersionDecompiledText(expectedBinaryVersion(), file.version)
-            }
-            is FileWithMetadata.Compatible -> {
-                val packageFqName = file.packageFqName
-                val resolver = KotlinMetadataDeserializerForDecompiler(
-                    packageFqName, file.proto, file.nameResolver, file.version,
-                    serializerProtocol(), flexibleTypeDeserializer
-                )
-                val declarations = arrayListOf<DeclarationDescriptor>()
-                declarations.addAll(resolver.resolveDeclarationsInFacade(packageFqName))
-                for (classProto in file.classesToDecompile) {
-                    val classId = file.nameResolver.getClassId(classProto.fqName)
-                    declarations.addIfNotNull(resolver.resolveTopLevelClass(classId))
-                }
-                buildDecompiledText(packageFqName, declarations, renderer)
-            }
-        }
-    }
-}
-
-sealed class FileWithMetadata {
-    class Incompatible(val version: BinaryVersion) : FileWithMetadata()
-
-    open class Compatible(
-        val proto: ProtoBuf.PackageFragment,
-        val version: BinaryVersion,
-        serializerProtocol: SerializerExtensionProtocol
-    ) : FileWithMetadata() {
-        val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
-        val packageFqName = FqName(nameResolver.getPackageFqName(proto.`package`.getExtension(serializerProtocol.packageFqName)))
-
-        open val classesToDecompile: List<ProtoBuf.Class> =
-            proto.class_List.filter { proto ->
-                val classId = nameResolver.getClassId(proto.fqName)
-                !classId.isNestedClass && classId !in ClassDeserializer.BLACK_LIST
-            }
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt
deleted file mode 100644
index f3a0fca1c343..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.common
-
-import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.kotlin.builtins.DefaultBuiltIns
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.descriptors.NotFoundClasses
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompilerBase
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotlinAnyLocalClassifierResolver
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.resolve.sam.SamConversionResolverImpl
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.*
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-
-class KotlinMetadataDeserializerForDecompiler(
-    packageFqName: FqName,
-    private val proto: ProtoBuf.PackageFragment,
-    private val nameResolver: NameResolver,
-    private val metadataVersion: BinaryVersion,
-    serializerProtocol: SerializerExtensionProtocol,
-    flexibleTypeDeserializer: FlexibleTypeDeserializer
-) : DeserializerForDecompilerBase(packageFqName) {
-    override val builtIns: KotlinBuiltIns get() = DefaultBuiltIns.Instance
-
-    override val deserializationComponents: DeserializationComponents
-
-    init {
-        val notFoundClasses = NotFoundClasses(storageManager, moduleDescriptor)
-
-        deserializationComponents = DeserializationComponents(
-            storageManager, moduleDescriptor, DeserializationConfiguration.Default,
-            ProtoBasedClassDataFinder(proto, nameResolver, metadataVersion),
-            AnnotationAndConstantLoaderImpl(moduleDescriptor, notFoundClasses, serializerProtocol), packageFragmentProvider,
-            ResolveEverythingToKotlinAnyLocalClassifierResolver(builtIns), LoggingErrorReporter(LOG),
-            LookupTracker.DO_NOTHING, flexibleTypeDeserializer, emptyList(), notFoundClasses,
-            ContractDeserializer.DEFAULT,
-            extensionRegistryLite = serializerProtocol.extensionRegistry,
-            samConversionResolver = SamConversionResolverImpl(storageManager, samWithReceiverResolvers = emptyList())
-        )
-    }
-
-    override fun resolveDeclarationsInFacade(facadeFqName: FqName): List<DeclarationDescriptor> {
-        assert(facadeFqName == directoryPackageFqName) {
-            "Was called for $facadeFqName; only members of $directoryPackageFqName package are expected."
-        }
-
-        val dummyPackageFragment = createDummyPackageFragment(facadeFqName)
-        val membersScope = DeserializedPackageMemberScope(
-            dummyPackageFragment, proto.`package`, nameResolver, metadataVersion, containerSource = null,
-            components = deserializationComponents,
-            debugName = "scope of dummyPackageFragment ${dummyPackageFragment.fqName} in module " +
-                    "${deserializationComponents.moduleDescriptor} @KotlinMetadataDeserializerForDecompiler"
-        ) { emptyList() }
-
-        return membersScope.getContributedDescriptors().toList()
-    }
-
-    companion object {
-        private val LOG = Logger.getInstance(KotlinMetadataDeserializerForDecompiler::class.java)
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt
deleted file mode 100644
index b3245061c1b1..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataStubBuilder.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.common
-
-import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.psi.compiled.ClsStubBuilder
-import com.intellij.psi.impl.compiled.ClassFileStubBuilder
-import com.intellij.psi.stubs.PsiFileStub
-import com.intellij.util.indexing.FileContent
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.*
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.deserialization.ProtoBasedClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-
-open class KotlinMetadataStubBuilder(
-    private val version: Int,
-    private val fileType: FileType,
-    private val serializerProtocol: () -> SerializerExtensionProtocol,
-    private val readFile: (VirtualFile, ByteArray) -> FileWithMetadata?
-) : ClsStubBuilder() {
-    override fun getStubVersion() = ClassFileStubBuilder.STUB_VERSION + version
-
-    override fun buildFileStub(content: FileContent): PsiFileStub<*>? {
-        val virtualFile = content.file
-        assert(virtualFile.fileType == fileType) { "Unexpected file type ${virtualFile.fileType}" }
-        val file = readFile(virtualFile, content.content) ?: return null
-
-        when (file) {
-            is FileWithMetadata.Incompatible -> {
-                return createIncompatibleAbiVersionFileStub()
-            }
-            is FileWithMetadata.Compatible -> {
-                val packageProto = file.proto.`package`
-                val packageFqName = file.packageFqName
-                val nameResolver = file.nameResolver
-                val components = ClsStubBuilderComponents(
-                    ProtoBasedClassDataFinder(file.proto, nameResolver, file.version),
-                    AnnotationLoaderForStubBuilderImpl(serializerProtocol()),
-                    virtualFile
-                )
-                val context = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
-
-                val fileStub = createFileStub(packageFqName, isScript = false)
-                createPackageDeclarationsStubs(
-                    fileStub, context,
-                    ProtoContainer.Package(packageFqName, context.nameResolver, context.typeTable, source = null),
-                    packageProto
-                )
-                for (classProto in file.classesToDecompile) {
-                    createClassStub(
-                        fileStub, classProto, nameResolver, nameResolver.getClassId(classProto.fqName), source = null, context = context
-                    )
-                }
-                return fileStub
-            }
-        }
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/incompatibleAbiVersion.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/incompatibleAbiVersion.kt
deleted file mode 100644
index 14e6352f7a2a..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/common/incompatibleAbiVersion.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.common
-
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndex
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
-
-private const val FILE_ABI_VERSION_MARKER: String = "FILE_ABI"
-private const val CURRENT_ABI_VERSION_MARKER: String = "CURRENT_ABI"
-
-const val INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT: String =
-    "// This class file was compiled with different version of Kotlin compiler and can't be decompiled."
-
-private const val INCOMPATIBLE_ABI_VERSION_COMMENT: String = "$INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT\n" +
-        "//\n" +
-        "// Current compiler ABI version is $CURRENT_ABI_VERSION_MARKER\n" +
-        "// File ABI version is $FILE_ABI_VERSION_MARKER"
-
-fun <V : BinaryVersion> createIncompatibleAbiVersionDecompiledText(expectedVersion: V, actualVersion: V): DecompiledText = DecompiledText(
-    INCOMPATIBLE_ABI_VERSION_COMMENT.replace(CURRENT_ABI_VERSION_MARKER, expectedVersion.toString())
-        .replace(FILE_ABI_VERSION_MARKER, actualVersion.toString()),
-    DecompiledTextIndex.Empty
-)
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
index 967d84f449cf..b525fa94861c 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
@@ -3,8 +3,8 @@
 package org.jetbrains.kotlin.idea.decompiler.js
 
 import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata
-import org.jetbrains.kotlin.idea.decompiler.common.KotlinMetadataDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinMetadataDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinMetadataStubBuilder
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
@@ -17,17 +17,17 @@ class KotlinJavaScriptMetaFileDecompiler : KotlinMetadataDecompiler<JsMetadataVe
     KotlinJavaScriptMetaFileType, { JsSerializerProtocol }, DynamicTypeDeserializer,
     { JsMetadataVersion.INSTANCE }, { JsMetadataVersion.INVALID_VERSION }, KotlinStubVersions.JS_STUB_VERSION
 ) {
-    override fun readFile(bytes: ByteArray, file: VirtualFile): FileWithMetadata? {
+    override fun readFile(bytes: ByteArray, file: VirtualFile): KotlinMetadataStubBuilder.FileWithMetadata? {
         val stream = ByteArrayInputStream(bytes)
 
         val version = JsMetadataVersion.readFrom(stream)
         if (!version.isCompatible()) {
-            return FileWithMetadata.Incompatible(version)
+            return KotlinMetadataStubBuilder.FileWithMetadata.Incompatible(version)
         }
 
         JsProtoBuf.Header.parseDelimitedFrom(stream)
 
         val proto = ProtoBuf.PackageFragment.parseFrom(stream, JsSerializerProtocol.extensionRegistry)
-        return FileWithMetadata.Compatible(proto, version, JsSerializerProtocol)
+        return KotlinMetadataStubBuilder.FileWithMetadata.Compatible(proto, version, JsSerializerProtocol)
     }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
index bd20ecd998b7..038e61fe5928 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt
@@ -5,32 +5,19 @@ package org.jetbrains.kotlin.idea.decompiler.navigation
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.EverythingGlobalScope
 import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtDecompiledFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.ByDescriptorIndexer
 import org.jetbrains.kotlin.analyzer.ModuleInfo
-import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsSignatures
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
 import org.jetbrains.kotlin.idea.caches.project.BinaryModuleInfo
-import org.jetbrains.kotlin.idea.caches.resolve.LOG
-import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndexer
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
 import org.jetbrains.kotlin.idea.stubindex.*
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
-import org.jetbrains.kotlin.psi.KtCallableDeclaration
-import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtDeclarationContainer
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
-import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass
-import org.jetbrains.kotlin.types.ErrorUtils
-import java.util.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 
 fun findDecompiledDeclaration(
     project: Project,
@@ -109,88 +96,3 @@ private fun findCandidateDeclarationsInIndex(
         else -> error("Referenced non local declaration that is not inside top level function, property, class or typealias:\n $referencedDescriptor")
     }
 }
-
-object ByDescriptorIndexer : DecompiledTextIndexer<String> {
-    override fun indexDescriptor(descriptor: DeclarationDescriptor): Collection<String> {
-        return listOf(descriptor.toStringKey())
-    }
-
-    internal fun getDeclarationForDescriptor(descriptor: DeclarationDescriptor, file: KtDecompiledFile): KtDeclaration? {
-        val original = descriptor.original
-
-        if (original is TypeAliasConstructorDescriptor) {
-            return getDeclarationForDescriptor(original.typeAliasDescriptor, file)
-        }
-
-        if (original is ValueParameterDescriptor) {
-            val callable = original.containingDeclaration
-            val callableDeclaration = getDeclarationForDescriptor(callable, file) as? KtCallableDeclaration ?: return null
-            if (original.index >= callableDeclaration.valueParameters.size) {
-                LOG.error(
-                    "Parameter count mismatch for ${DescriptorRenderer.DEBUG_TEXT.render(callable)}[${original.index}] vs " +
-                            callableDeclaration.valueParameterList?.text
-                )
-                return null
-            }
-            return callableDeclaration.valueParameters[original.index]
-        }
-
-        if (original is ConstructorDescriptor && original.isPrimary) {
-            val classOrObject = getDeclarationForDescriptor(original.containingDeclaration, file) as? KtClassOrObject
-            return classOrObject?.primaryConstructor ?: classOrObject
-        }
-
-        val descriptorKey = original.toStringKey()
-
-        if (!file.isContentsLoaded && original is MemberDescriptor) {
-            val hasDeclarationByKey = file.hasDeclarationWithKey(this, descriptorKey) || (getBuiltinsDescriptorKey(descriptor)?.let {
-                file.hasDeclarationWithKey(
-                    this,
-                    it
-                )
-            } ?: false)
-            if (hasDeclarationByKey) {
-                val declarationContainer: KtDeclarationContainer? = when {
-                    DescriptorUtils.isTopLevelDeclaration(original) -> file
-                    original.containingDeclaration is ClassDescriptor ->
-                        getDeclarationForDescriptor(original.containingDeclaration as ClassDescriptor, file) as? KtClassOrObject
-                    else -> null
-                }
-
-                if (declarationContainer != null) {
-                    val descriptorName = original.name.asString()
-                    val singleOrNull = declarationContainer.declarations.singleOrNull { it.name == descriptorName }
-                    if (singleOrNull != null) {
-                        return singleOrNull
-                    }
-                }
-            }
-        }
-
-        return file.getDeclaration(this, descriptorKey) ?: run {
-            return getBuiltinsDescriptorKey(descriptor)?.let { file.getDeclaration(this, it) }
-        }
-    }
-
-    fun getBuiltinsDescriptorKey(descriptor: DeclarationDescriptor): String? {
-        if (descriptor !is ClassDescriptor) return null
-
-        val classFqName = descriptor.fqNameUnsafe
-        if (!JvmBuiltInsSignatures.isSerializableInJava(classFqName)) return null
-
-        val builtInDescriptor =
-            DefaultBuiltIns.Instance.builtInsModule.resolveTopLevelClass(classFqName.toSafe(), NoLookupLocation.FROM_IDE)
-        return builtInDescriptor?.toStringKey()
-    }
-
-    private fun DeclarationDescriptor.toStringKey(): String {
-        return descriptorRendererForKeys.render(this)
-    }
-
-    private val descriptorRendererForKeys = DescriptorRenderer.withOptions {
-        defaultDecompilerRendererOptions()
-        withDefinedIn = true
-        renderUnabbreviatedType = false
-        defaultParameterValueRenderer = null
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
deleted file mode 100644
index 175608553022..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ /dev/null
@@ -1,286 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.psi.PsiElement
-import com.intellij.psi.stubs.StubElement
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.*
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.ProtoBuf.MemberKind
-import org.jetbrains.kotlin.metadata.ProtoBuf.Modality
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-import org.jetbrains.kotlin.metadata.deserialization.hasReceiver
-import org.jetbrains.kotlin.metadata.deserialization.receiverType
-import org.jetbrains.kotlin.metadata.deserialization.returnType
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl
-import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
-import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getName
-
-fun createPackageDeclarationsStubs(
-    parentStub: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer.Package,
-    packageProto: ProtoBuf.Package
-) {
-    createDeclarationsStubs(parentStub, outerContext, protoContainer, packageProto.functionList, packageProto.propertyList)
-    createTypeAliasesStubs(parentStub, outerContext, protoContainer, packageProto.typeAliasList)
-}
-
-fun createDeclarationsStubs(
-    parentStub: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
-    functionProtos: List<ProtoBuf.Function>,
-    propertyProtos: List<ProtoBuf.Property>,
-) {
-    for (propertyProto in propertyProtos) {
-        if (!shouldSkip(propertyProto.flags, outerContext.nameResolver.getName(propertyProto.name))) {
-            PropertyClsStubBuilder(parentStub, outerContext, protoContainer, propertyProto).build()
-        }
-    }
-    for (functionProto in functionProtos) {
-        if (!shouldSkip(functionProto.flags, outerContext.nameResolver.getName(functionProto.name))) {
-            FunctionClsStubBuilder(parentStub, outerContext, protoContainer, functionProto).build()
-        }
-    }
-}
-
-fun createTypeAliasesStubs(
-    parentStub: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
-    typeAliasesProtos: List<ProtoBuf.TypeAlias>
-) {
-    for (typeAliasProto in typeAliasesProtos) {
-        createTypeAliasStub(parentStub, typeAliasProto, protoContainer, outerContext)
-    }
-}
-
-fun createConstructorStub(
-    parentStub: StubElement<out PsiElement>,
-    constructorProto: ProtoBuf.Constructor,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer
-) {
-    ConstructorClsStubBuilder(parentStub, outerContext, protoContainer, constructorProto).build()
-}
-
-private fun shouldSkip(flags: Int, name: Name): Boolean {
-    return when (Flags.MEMBER_KIND.get(flags)) {
-        MemberKind.FAKE_OVERRIDE, MemberKind.DELEGATION -> true
-        //TODO: fix decompiler to use sane criteria
-        MemberKind.SYNTHESIZED -> !DataClassDescriptorResolver.isComponentLike(name)
-        else -> false
-    }
-}
-
-abstract class CallableClsStubBuilder(
-    parent: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protected val protoContainer: ProtoContainer,
-    private val typeParameters: List<ProtoBuf.TypeParameter>
-) {
-    protected val c = outerContext.child(typeParameters)
-    protected val typeStubBuilder = TypeClsStubBuilder(c)
-    protected val isTopLevel: Boolean get() = protoContainer is ProtoContainer.Package
-    protected val callableStub: StubElement<out PsiElement> by lazy(LazyThreadSafetyMode.NONE) { doCreateCallableStub(parent) }
-
-    fun build() {
-        createModifierListStub()
-        val typeConstraintListData = typeStubBuilder.createTypeParameterListStub(callableStub, typeParameters)
-        createReceiverTypeReferenceStub()
-        createValueParameterList()
-        createReturnTypeStub()
-        typeStubBuilder.createTypeConstraintListStub(callableStub, typeConstraintListData)
-    }
-
-    abstract val receiverType: ProtoBuf.Type?
-    abstract val receiverAnnotations: List<ClassIdWithTarget>
-
-    abstract val returnType: ProtoBuf.Type?
-
-    private fun createReceiverTypeReferenceStub() {
-        receiverType?.let {
-            typeStubBuilder.createTypeReferenceStub(callableStub, it, this::receiverAnnotations)
-        }
-    }
-
-    private fun createReturnTypeStub() {
-        returnType?.let {
-            typeStubBuilder.createTypeReferenceStub(callableStub, it)
-        }
-    }
-
-    abstract fun createModifierListStub()
-
-    abstract fun createValueParameterList()
-
-    abstract fun doCreateCallableStub(parent: StubElement<out PsiElement>): StubElement<out PsiElement>
-}
-
-private class FunctionClsStubBuilder(
-    parent: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
-    private val functionProto: ProtoBuf.Function
-) : CallableClsStubBuilder(parent, outerContext, protoContainer, functionProto.typeParameterList) {
-    override val receiverType: ProtoBuf.Type?
-        get() = functionProto.receiverType(c.typeTable)
-
-    override val receiverAnnotations: List<ClassIdWithTarget>
-        get() {
-            return c.components.annotationLoader
-                .loadExtensionReceiverParameterAnnotations(protoContainer, functionProto, AnnotatedCallableKind.FUNCTION)
-                .map { ClassIdWithTarget(it, AnnotationUseSiteTarget.RECEIVER) }
-        }
-
-    override val returnType: ProtoBuf.Type
-        get() = functionProto.returnType(c.typeTable)
-
-    override fun createValueParameterList() {
-        typeStubBuilder.createValueParameterListStub(callableStub, functionProto, functionProto.valueParameterList, protoContainer)
-    }
-
-    override fun createModifierListStub() {
-        val modalityModifier = if (isTopLevel) listOf() else listOf(MODALITY)
-        val modifierListStubImpl = createModifierListStubForDeclaration(
-            callableStub, functionProto.flags,
-            listOf(VISIBILITY, OPERATOR, INFIX, EXTERNAL_FUN, INLINE, TAILREC, SUSPEND) + modalityModifier
-        )
-
-        // If function is marked as having no annotations, we don't create stubs for it
-        if (!Flags.HAS_ANNOTATIONS.get(functionProto.flags)) return
-
-        val annotationIds = c.components.annotationLoader.loadCallableAnnotations(
-            protoContainer, functionProto, AnnotatedCallableKind.FUNCTION
-        )
-        createAnnotationStubs(annotationIds, modifierListStubImpl)
-    }
-
-    override fun doCreateCallableStub(parent: StubElement<out PsiElement>): StubElement<out PsiElement> {
-        val callableName = c.nameResolver.getName(functionProto.name)
-
-        return KotlinFunctionStubImpl(
-            parent,
-            callableName.ref(),
-            isTopLevel,
-            c.containerFqName.child(callableName),
-            isExtension = functionProto.hasReceiver(),
-            hasBlockBody = true,
-            hasBody = Flags.MODALITY.get(functionProto.flags) != Modality.ABSTRACT,
-            hasTypeParameterListBeforeFunctionName = functionProto.typeParameterList.isNotEmpty(),
-            mayHaveContract = functionProto.hasContract()
-        )
-    }
-}
-
-private class PropertyClsStubBuilder(
-    parent: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
-    private val propertyProto: ProtoBuf.Property
-) : CallableClsStubBuilder(parent, outerContext, protoContainer, propertyProto.typeParameterList) {
-    private val isVar = Flags.IS_VAR.get(propertyProto.flags)
-
-    override val receiverType: ProtoBuf.Type?
-        get() = propertyProto.receiverType(c.typeTable)
-
-    override val receiverAnnotations: List<ClassIdWithTarget>
-        get() = c.components.annotationLoader
-            .loadExtensionReceiverParameterAnnotations(protoContainer, propertyProto, AnnotatedCallableKind.PROPERTY_GETTER)
-            .map { ClassIdWithTarget(it, AnnotationUseSiteTarget.RECEIVER) }
-
-    override val returnType: ProtoBuf.Type
-        get() = propertyProto.returnType(c.typeTable)
-
-    override fun createValueParameterList() {
-    }
-
-    override fun createModifierListStub() {
-        val constModifier = if (isVar) listOf() else listOf(CONST)
-        val modalityModifier = if (isTopLevel) listOf() else listOf(MODALITY)
-
-        val modifierListStubImpl = createModifierListStubForDeclaration(
-            callableStub, propertyProto.flags,
-            listOf(VISIBILITY, LATEINIT, EXTERNAL_PROPERTY) + constModifier + modalityModifier
-        )
-
-        // If field is marked as having no annotations, we don't create stubs for it
-        if (!Flags.HAS_ANNOTATIONS.get(propertyProto.flags)) return
-
-        val propertyAnnotations =
-            c.components.annotationLoader.loadCallableAnnotations(protoContainer, propertyProto, AnnotatedCallableKind.PROPERTY)
-        val backingFieldAnnotations =
-            c.components.annotationLoader.loadPropertyBackingFieldAnnotations(protoContainer, propertyProto)
-        val delegateFieldAnnotations =
-            c.components.annotationLoader.loadPropertyDelegateFieldAnnotations(protoContainer, propertyProto)
-        val allAnnotations =
-            propertyAnnotations.map { ClassIdWithTarget(it, null) } +
-                    backingFieldAnnotations.map { ClassIdWithTarget(it, AnnotationUseSiteTarget.FIELD) } +
-                    delegateFieldAnnotations.map { ClassIdWithTarget(it, AnnotationUseSiteTarget.PROPERTY_DELEGATE_FIELD) }
-        createTargetedAnnotationStubs(allAnnotations, modifierListStubImpl)
-    }
-
-    override fun doCreateCallableStub(parent: StubElement<out PsiElement>): StubElement<out PsiElement> {
-        val callableName = c.nameResolver.getName(propertyProto.name)
-
-        return KotlinPropertyStubImpl(
-            parent,
-            callableName.ref(),
-            isVar,
-            isTopLevel,
-            hasDelegate = false,
-            hasDelegateExpression = false,
-            hasInitializer = false,
-            isExtension = propertyProto.hasReceiver(),
-            hasReturnTypeRef = true,
-            fqName = c.containerFqName.child(callableName)
-        )
-    }
-}
-
-private class ConstructorClsStubBuilder(
-    parent: StubElement<out PsiElement>,
-    outerContext: ClsStubBuilderContext,
-    protoContainer: ProtoContainer,
-    private val constructorProto: ProtoBuf.Constructor
-) : CallableClsStubBuilder(parent, outerContext, protoContainer, emptyList()) {
-    override val receiverType: ProtoBuf.Type?
-        get() = null
-
-    override val receiverAnnotations: List<ClassIdWithTarget>
-        get() = emptyList()
-
-    override val returnType: ProtoBuf.Type?
-        get() = null
-
-    override fun createValueParameterList() {
-        typeStubBuilder.createValueParameterListStub(callableStub, constructorProto, constructorProto.valueParameterList, protoContainer)
-    }
-
-    override fun createModifierListStub() {
-        val modifierListStubImpl = createModifierListStubForDeclaration(callableStub, constructorProto.flags, listOf(VISIBILITY))
-
-        // If constructor is marked as having no annotations, we don't create stubs for it
-        if (!Flags.HAS_ANNOTATIONS.get(constructorProto.flags)) return
-
-        val annotationIds = c.components.annotationLoader.loadCallableAnnotations(
-            protoContainer, constructorProto, AnnotatedCallableKind.FUNCTION
-        )
-        createAnnotationStubs(annotationIds, modifierListStubImpl)
-    }
-
-    override fun doCreateCallableStub(parent: StubElement<out PsiElement>): StubElement<out PsiElement> {
-        return if (Flags.IS_SECONDARY.get(constructorProto.flags))
-            KotlinPlaceHolderStubImpl(parent, KtStubElementTypes.SECONDARY_CONSTRUCTOR)
-        else
-            KotlinPlaceHolderStubImpl(parent, KtStubElementTypes.PRIMARY_CONSTRUCTOR)
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
deleted file mode 100644
index 10d644a05b6f..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.psi.PsiElement
-import com.intellij.psi.stubs.StubElement
-import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.builtins.isNumberedFunctionClassFqName
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.*
-import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.metadata.deserialization.supertypes
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.psi.KtClassBody
-import org.jetbrains.kotlin.psi.KtSuperTypeEntry
-import org.jetbrains.kotlin.psi.KtSuperTypeList
-import org.jetbrains.kotlin.psi.stubs.elements.KtClassElementType
-import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.serialization.deserialization.getName
-
-fun createClassStub(
-    parent: StubElement<out PsiElement>,
-    classProto: ProtoBuf.Class,
-    nameResolver: NameResolver,
-    classId: ClassId,
-    source: SourceElement?,
-    context: ClsStubBuilderContext
-) {
-    ClassClsStubBuilder(parent, classProto, nameResolver, classId, source, context).build()
-}
-
-private class ClassClsStubBuilder(
-    private val parentStub: StubElement<out PsiElement>,
-    private val classProto: ProtoBuf.Class,
-    nameResolver: NameResolver,
-    private val classId: ClassId,
-    source: SourceElement?,
-    outerContext: ClsStubBuilderContext
-) {
-    private val thisAsProtoContainer = ProtoContainer.Class(
-        classProto, nameResolver, TypeTable(classProto.typeTable), source, outerContext.protoContainer
-    )
-    private val classKind = thisAsProtoContainer.kind
-
-    private val c = outerContext.child(
-        classProto.typeParameterList, classId.shortClassName, nameResolver, thisAsProtoContainer.typeTable, thisAsProtoContainer
-    )
-    private val typeStubBuilder = TypeClsStubBuilder(c)
-    private val supertypeIds = run {
-        val supertypeIds = classProto.supertypes(c.typeTable).map { c.nameResolver.getClassId(it.className) }
-        //empty supertype list if single supertype is Any
-        if (supertypeIds.singleOrNull()?.let { StandardNames.FqNames.any == it.asSingleFqName().toUnsafe() } == true) {
-            listOf()
-        } else {
-            supertypeIds
-        }
-    }
-
-    private val companionObjectName = if (classProto.hasCompanionObjectName())
-        c.nameResolver.getName(classProto.companionObjectName)
-    else
-        null
-
-    private val classOrObjectStub = createClassOrObjectStubAndModifierListStub()
-
-    fun build() {
-        val typeConstraintListData = typeStubBuilder.createTypeParameterListStub(classOrObjectStub, classProto.typeParameterList)
-        createConstructorStub()
-        createDelegationSpecifierList()
-        typeStubBuilder.createTypeConstraintListStub(classOrObjectStub, typeConstraintListData)
-        createClassBodyAndMemberStubs()
-    }
-
-    private fun createClassOrObjectStubAndModifierListStub(): StubElement<out PsiElement> {
-        val classOrObjectStub = doCreateClassOrObjectStub()
-        val modifierList = createModifierListForClass(classOrObjectStub)
-        if (Flags.HAS_ANNOTATIONS.get(classProto.flags)) {
-            createAnnotationStubs(c.components.annotationLoader.loadClassAnnotations(thisAsProtoContainer), modifierList)
-        }
-        return classOrObjectStub
-    }
-
-    private fun createModifierListForClass(parent: StubElement<out PsiElement>): KotlinModifierListStubImpl {
-        val relevantFlags = arrayListOf(VISIBILITY)
-        relevantFlags.add(EXTERNAL_CLASS)
-        if (isClass()) {
-            relevantFlags.add(INNER)
-            relevantFlags.add(DATA)
-            relevantFlags.add(MODALITY)
-            relevantFlags.add(VALUE_CLASS)
-        }
-        if (isInterface()) {
-            relevantFlags.add(FUN_INTERFACE)
-        }
-        val additionalModifiers = when (classKind) {
-            ProtoBuf.Class.Kind.ENUM_CLASS -> listOf(KtTokens.ENUM_KEYWORD)
-            ProtoBuf.Class.Kind.COMPANION_OBJECT -> listOf(KtTokens.COMPANION_KEYWORD)
-            ProtoBuf.Class.Kind.ANNOTATION_CLASS -> listOf(KtTokens.ANNOTATION_KEYWORD)
-            else -> listOf<KtModifierKeywordToken>()
-        }
-        return createModifierListStubForDeclaration(parent, classProto.flags, relevantFlags, additionalModifiers)
-    }
-
-    private fun doCreateClassOrObjectStub(): StubElement<out PsiElement> {
-        val isCompanionObject = classKind == ProtoBuf.Class.Kind.COMPANION_OBJECT
-        val fqName = classId.asSingleFqName()
-        val shortName = fqName.shortName().ref()
-        val superTypeRefs = supertypeIds.filterNot {
-            //TODO: filtering function types should go away
-            isNumberedFunctionClassFqName(it.asSingleFqName().toUnsafe())
-        }.map { it.shortClassName.ref() }.toTypedArray()
-        val classId = classId.takeUnless { it.isLocal }
-        return when (classKind) {
-            ProtoBuf.Class.Kind.OBJECT, ProtoBuf.Class.Kind.COMPANION_OBJECT -> {
-                KotlinObjectStubImpl(
-                    parentStub, shortName, fqName,
-                    classId = classId,
-                    superTypeRefs,
-                    isTopLevel = !this.classId.isNestedClass,
-                    isDefault = isCompanionObject,
-                    isLocal = false,
-                    isObjectLiteral = false,
-                )
-            }
-            else -> {
-                KotlinClassStubImpl(
-                    KtClassElementType.getStubType(classKind == ProtoBuf.Class.Kind.ENUM_ENTRY),
-                    parentStub,
-                    fqName.ref(),
-                    classId = classId,
-                    shortName,
-                    superTypeRefs,
-                    isInterface = classKind == ProtoBuf.Class.Kind.INTERFACE,
-                    isEnumEntry = classKind == ProtoBuf.Class.Kind.ENUM_ENTRY,
-                    isLocal = false,
-                    isTopLevel = !this.classId.isNestedClass,
-                )
-            }
-        }
-    }
-
-    private fun createConstructorStub() {
-        if (!isClass()) return
-
-        val primaryConstructorProto = classProto.constructorList.find { !Flags.IS_SECONDARY.get(it.flags) } ?: return
-
-        createConstructorStub(classOrObjectStub, primaryConstructorProto, c, thisAsProtoContainer)
-    }
-
-    private fun createDelegationSpecifierList() {
-        // if single supertype is any then no delegation specifier list is needed
-        if (supertypeIds.isEmpty()) return
-
-        val delegationSpecifierListStub = KotlinPlaceHolderStubImpl<KtSuperTypeList>(classOrObjectStub, KtStubElementTypes.SUPER_TYPE_LIST)
-
-        classProto.supertypes(c.typeTable).forEach { type ->
-            val superClassStub = KotlinPlaceHolderStubImpl<KtSuperTypeEntry>(
-                delegationSpecifierListStub, KtStubElementTypes.SUPER_TYPE_ENTRY
-            )
-            typeStubBuilder.createTypeReferenceStub(superClassStub, type)
-        }
-    }
-
-    private fun createClassBodyAndMemberStubs() {
-        val classBody = KotlinPlaceHolderStubImpl<KtClassBody>(classOrObjectStub, KtStubElementTypes.CLASS_BODY)
-        createEnumEntryStubs(classBody)
-        createCompanionObjectStub(classBody)
-        createCallableMemberStubs(classBody)
-        createInnerAndNestedClasses(classBody)
-        createTypeAliasesStubs(classBody)
-    }
-
-    private fun createCompanionObjectStub(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
-        if (companionObjectName == null) {
-            return
-        }
-
-        val companionObjectId = classId.createNestedClassId(companionObjectName)
-        createNestedClassStub(classBody, companionObjectId)
-    }
-
-    private fun createEnumEntryStubs(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
-        if (classKind != ProtoBuf.Class.Kind.ENUM_CLASS) return
-
-        classProto.enumEntryList.forEach { entry ->
-            val name = c.nameResolver.getName(entry.name)
-            val annotations = c.components.annotationLoader.loadEnumEntryAnnotations(thisAsProtoContainer, entry)
-            val enumEntryStub = KotlinClassStubImpl(
-                KtStubElementTypes.ENUM_ENTRY,
-                classBody,
-                qualifiedName = c.containerFqName.child(name).ref(),
-                classId = null, // enum entry do not have class id
-                name = name.ref(),
-                superNames = arrayOf(),
-                isInterface = false,
-                isEnumEntry = true,
-                isLocal = false,
-                isTopLevel = false
-            )
-            if (annotations.isNotEmpty()) {
-                createAnnotationStubs(annotations, createEmptyModifierListStub(enumEntryStub))
-            }
-        }
-    }
-
-    private fun createCallableMemberStubs(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
-        for (secondaryConstructorProto in classProto.constructorList) {
-            if (Flags.IS_SECONDARY.get(secondaryConstructorProto.flags)) {
-                createConstructorStub(classBody, secondaryConstructorProto, c, thisAsProtoContainer)
-            }
-        }
-
-        createDeclarationsStubs(classBody, c, thisAsProtoContainer, classProto.functionList, classProto.propertyList)
-    }
-
-    private fun isClass(): Boolean {
-        return classKind == ProtoBuf.Class.Kind.CLASS ||
-                classKind == ProtoBuf.Class.Kind.ENUM_CLASS ||
-                classKind == ProtoBuf.Class.Kind.ANNOTATION_CLASS
-    }
-
-    private fun isInterface(): Boolean {
-        return classKind == ProtoBuf.Class.Kind.INTERFACE
-    }
-
-    private fun createInnerAndNestedClasses(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
-        classProto.nestedClassNameList.forEach { id ->
-            val nestedClassName = c.nameResolver.getName(id)
-            if (nestedClassName != companionObjectName) {
-                val nestedClassId = classId.createNestedClassId(nestedClassName)
-                createNestedClassStub(classBody, nestedClassId)
-            }
-        }
-    }
-
-    private fun createTypeAliasesStubs(classBody: KotlinPlaceHolderStubImpl<KtClassBody>) {
-        createTypeAliasesStubs(classBody, c, thisAsProtoContainer, classProto.typeAliasList)
-    }
-
-    private fun createNestedClassStub(classBody: StubElement<out PsiElement>, nestedClassId: ClassId) {
-        val (nameResolver, classProto, _, sourceElement) =
-            c.components.classDataFinder.findClassData(nestedClassId)
-                ?: c.components.virtualFileForDebug.let { rootFile ->
-                    val outerClassId = nestedClassId.outerClassId
-                    val sortedChildren = rootFile.parent.children.sortedBy { it.name }
-                    val msgPrefix = "Could not find data for nested class $nestedClassId of class $outerClassId\n"
-                    val explanation = when {
-                        outerClassId != null && sortedChildren.none { it.name.startsWith("${outerClassId.relativeClassName}\$a") } ->
-                            // KT-29427: case with obfuscation
-                            "Reason: obfuscation suspected (single-letter name)\n"
-                        else ->
-                            // General case
-                            ""
-                    }
-                    val msg = msgPrefix + explanation +
-                            "Root file: ${rootFile.canonicalPath}\n" +
-                            "Dir: ${rootFile.parent.canonicalPath}\n" +
-                            "Children:\n" +
-                            sortedChildren.joinToString(separator = "\n") {
-                                "${it.name} (valid: ${it.isValid})"
-                            }
-                    LOG.info(msg)
-                    return
-                }
-        createClassStub(classBody, classProto, nameResolver, nestedClassId, sourceElement, c)
-    }
-
-    companion object {
-        private val LOG = Logger.getInstance(ClassClsStubBuilder::class.java)
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
deleted file mode 100644
index fa6fa62b3915..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getName
-
-data class ClassIdWithTarget(val classId: ClassId, val target: AnnotationUseSiteTarget?)
-
-class ClsStubBuilderComponents(
-    val classDataFinder: ClassDataFinder,
-    val annotationLoader: AnnotationAndConstantLoader<ClassId, Unit>,
-    val virtualFileForDebug: VirtualFile
-) {
-    fun createContext(
-        nameResolver: NameResolver,
-        packageFqName: FqName,
-        typeTable: TypeTable
-    ): ClsStubBuilderContext =
-        ClsStubBuilderContext(this, nameResolver, packageFqName, EmptyTypeParameters, typeTable, protoContainer = null)
-}
-
-interface TypeParameters {
-    operator fun get(id: Int): Name
-
-    fun child(nameResolver: NameResolver, innerTypeParameters: List<ProtoBuf.TypeParameter>) =
-        TypeParametersImpl(nameResolver, innerTypeParameters, parent = this)
-}
-
-object EmptyTypeParameters : TypeParameters {
-    override fun get(id: Int): Name = throw IllegalStateException("Unknown type parameter with id = $id")
-}
-
-class TypeParametersImpl(
-    nameResolver: NameResolver,
-    typeParameterProtos: Collection<ProtoBuf.TypeParameter>,
-    private val parent: TypeParameters
-) : TypeParameters {
-    private val typeParametersById = typeParameterProtos.map { Pair(it.id, nameResolver.getName(it.name)) }.toMap()
-
-    override fun get(id: Int): Name = typeParametersById[id] ?: parent[id]
-}
-
-class ClsStubBuilderContext(
-    val components: ClsStubBuilderComponents,
-    val nameResolver: NameResolver,
-    val containerFqName: FqName,
-    val typeParameters: TypeParameters,
-    val typeTable: TypeTable,
-    val protoContainer: ProtoContainer.Class?
-)
-
-internal fun ClsStubBuilderContext.child(
-    typeParameterList: List<ProtoBuf.TypeParameter>,
-    name: Name? = null,
-    nameResolver: NameResolver = this.nameResolver,
-    typeTable: TypeTable = this.typeTable,
-    protoContainer: ProtoContainer.Class? = this.protoContainer
-): ClsStubBuilderContext = ClsStubBuilderContext(
-    this.components,
-    nameResolver,
-    if (name != null) this.containerFqName.child(name) else this.containerFqName,
-    this.typeParameters.child(nameResolver, typeParameterList),
-    typeTable,
-    protoContainer
-)
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
deleted file mode 100644
index 6820aac24cea..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.psi.PsiElement
-import com.intellij.psi.stubs.StubElement
-import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.builtins.isBuiltinFunctionClass
-import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.ProtoBuf.Type
-import org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection
-import org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance
-import org.jetbrains.kotlin.metadata.deserialization.*
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
-import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
-import org.jetbrains.kotlin.psi.stubs.impl.*
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.serialization.deserialization.getName
-import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
-import org.jetbrains.kotlin.utils.doNothing
-import java.util.*
-
-// TODO: see DescriptorRendererOptions.excludedTypeAnnotationClasses for decompiler
-private val ANNOTATIONS_NOT_LOADED_FOR_TYPES = setOf(StandardNames.FqNames.parameterName)
-
-class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
-    fun createTypeReferenceStub(
-        parent: StubElement<out PsiElement>,
-        type: Type,
-        additionalAnnotations: () -> List<ClassIdWithTarget> = { emptyList() }
-    ) {
-        val abbreviatedType = type.abbreviatedType(c.typeTable)
-        if (abbreviatedType != null) {
-            return createTypeReferenceStub(parent, abbreviatedType, additionalAnnotations)
-        }
-
-        val typeReference = KotlinPlaceHolderStubImpl<KtTypeReference>(parent, KtStubElementTypes.TYPE_REFERENCE)
-
-        val annotations = c.components.annotationLoader.loadTypeAnnotations(type, c.nameResolver).filterNot {
-            val isTopLevelClass = !it.isNestedClass
-            isTopLevelClass && it.asSingleFqName() in ANNOTATIONS_NOT_LOADED_FOR_TYPES
-        }
-
-        val allAnnotations = additionalAnnotations() + annotations.map { ClassIdWithTarget(it, null) }
-
-        when {
-            type.hasClassName() || type.hasTypeAliasName() ->
-                createClassReferenceTypeStub(typeReference, type, allAnnotations)
-            type.hasTypeParameter() ->
-                createTypeParameterStub(typeReference, type, c.typeParameters[type.typeParameter], allAnnotations)
-            type.hasTypeParameterName() ->
-                createTypeParameterStub(typeReference, type, c.nameResolver.getName(type.typeParameterName), allAnnotations)
-            else -> {
-                doNothing()
-            }
-        }
-    }
-
-    private fun nullableTypeParent(parent: KotlinStubBaseImpl<*>, type: Type): KotlinStubBaseImpl<*> = if (type.nullable)
-        KotlinPlaceHolderStubImpl<KtNullableType>(parent, KtStubElementTypes.NULLABLE_TYPE)
-    else
-        parent
-
-    private fun createTypeParameterStub(parent: KotlinStubBaseImpl<*>, type: Type, name: Name, annotations: List<ClassIdWithTarget>) {
-        createTypeAnnotationStubs(parent, type, annotations)
-        val nullableParentWrapper = nullableTypeParent(parent, type)
-        createStubForTypeName(ClassId.topLevel(FqName.topLevel(name)), nullableParentWrapper)
-    }
-
-    private fun createClassReferenceTypeStub(parent: KotlinStubBaseImpl<*>, type: Type, annotations: List<ClassIdWithTarget>) {
-        if (type.hasFlexibleTypeCapabilitiesId()) {
-            val id = c.nameResolver.getString(type.flexibleTypeCapabilitiesId)
-
-            if (id == DynamicTypeDeserializer.id) {
-                KotlinPlaceHolderStubImpl<KtDynamicType>(nullableTypeParent(parent, type), KtStubElementTypes.DYNAMIC_TYPE)
-                return
-            }
-        }
-
-        assert(type.hasClassName() || type.hasTypeAliasName()) {
-            "Class reference stub must have either class or type alias name"
-        }
-
-        val classId = c.nameResolver.getClassId(if (type.hasClassName()) type.className else type.typeAliasName)
-        val shouldBuildAsFunctionType = isBuiltinFunctionClass(classId) && type.argumentList.none { it.projection == Projection.STAR }
-        if (shouldBuildAsFunctionType) {
-            val (extensionAnnotations, notExtensionAnnotations) = annotations.partition {
-                it.classId.asSingleFqName() == StandardNames.FqNames.extensionFunctionType
-            }
-
-            val isExtension = extensionAnnotations.isNotEmpty()
-            val isSuspend = Flags.SUSPEND_TYPE.get(type.flags)
-
-            val nullableWrapper = if (isSuspend) {
-                val wrapper = nullableTypeParent(parent, type)
-                createTypeAnnotationStubs(wrapper, type, notExtensionAnnotations)
-                wrapper
-            } else {
-                createTypeAnnotationStubs(parent, type, notExtensionAnnotations)
-                nullableTypeParent(parent, type)
-            }
-
-            createFunctionTypeStub(nullableWrapper, type, isExtension, isSuspend)
-
-            return
-        }
-
-        createTypeAnnotationStubs(parent, type, annotations)
-
-        val outerTypeChain = generateSequence(type) { it.outerType(c.typeTable) }.toList()
-
-        createStubForTypeName(classId, nullableTypeParent(parent, type)) { userTypeStub, index ->
-            outerTypeChain.getOrNull(index)?.let { createTypeArgumentListStub(userTypeStub, it.argumentList) }
-        }
-    }
-
-    private fun createTypeAnnotationStubs(parent: KotlinStubBaseImpl<*>, type: Type, annotations: List<ClassIdWithTarget>) {
-        val typeModifiers = getTypeModifiersAsWritten(type)
-        if (annotations.isEmpty() && typeModifiers.isEmpty()) return
-        val typeModifiersMask = ModifierMaskUtils.computeMask { it in typeModifiers }
-        val modifiersList = KotlinModifierListStubImpl(parent, typeModifiersMask, KtStubElementTypes.MODIFIER_LIST)
-        createTargetedAnnotationStubs(annotations, modifiersList)
-    }
-
-    private fun getTypeModifiersAsWritten(type: Type): Set<KtModifierKeywordToken> {
-        if (!type.hasClassName() && !type.hasTypeAliasName()) return emptySet()
-
-        val result = hashSetOf<KtModifierKeywordToken>()
-
-        if (Flags.SUSPEND_TYPE.get(type.flags)) {
-            result.add(KtTokens.SUSPEND_KEYWORD)
-        }
-
-        return result
-    }
-
-    private fun createTypeArgumentListStub(typeStub: KotlinUserTypeStub, typeArgumentProtoList: List<Type.Argument>) {
-        if (typeArgumentProtoList.isEmpty()) {
-            return
-        }
-        val typeArgumentsListStub = KotlinPlaceHolderStubImpl<KtTypeArgumentList>(typeStub, KtStubElementTypes.TYPE_ARGUMENT_LIST)
-        typeArgumentProtoList.forEach { typeArgumentProto ->
-            val projectionKind = typeArgumentProto.projection.toProjectionKind()
-            val typeProjection = KotlinTypeProjectionStubImpl(typeArgumentsListStub, projectionKind.ordinal)
-            if (projectionKind != KtProjectionKind.STAR) {
-                val modifierKeywordToken = projectionKind.token as? KtModifierKeywordToken
-                createModifierListStub(typeProjection, listOfNotNull(modifierKeywordToken))
-                createTypeReferenceStub(typeProjection, typeArgumentProto.type(c.typeTable)!!)
-            }
-        }
-    }
-
-    private fun Projection.toProjectionKind() = when (this) {
-        Projection.IN -> KtProjectionKind.IN
-        Projection.OUT -> KtProjectionKind.OUT
-        Projection.INV -> KtProjectionKind.NONE
-        Projection.STAR -> KtProjectionKind.STAR
-    }
-
-    private fun createFunctionTypeStub(
-        parent: StubElement<out PsiElement>,
-        type: Type,
-        isExtensionFunctionType: Boolean,
-        isSuspend: Boolean
-    ) {
-        val typeArgumentList = type.argumentList
-        val functionType = KotlinPlaceHolderStubImpl<KtFunctionType>(parent, KtStubElementTypes.FUNCTION_TYPE)
-        if (isExtensionFunctionType) {
-            val functionTypeReceiverStub =
-                KotlinPlaceHolderStubImpl<KtFunctionTypeReceiver>(functionType, KtStubElementTypes.FUNCTION_TYPE_RECEIVER)
-            val receiverTypeProto = typeArgumentList.first().type(c.typeTable)!!
-            createTypeReferenceStub(functionTypeReceiverStub, receiverTypeProto)
-        }
-
-        val parameterList = KotlinPlaceHolderStubImpl<KtParameterList>(functionType, KtStubElementTypes.VALUE_PARAMETER_LIST)
-        val typeArgumentsWithoutReceiverAndReturnType =
-            typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size - 1)
-        var suspendParameterType: Type? = null
-
-        for ((index, argument) in typeArgumentsWithoutReceiverAndReturnType.withIndex()) {
-            if (isSuspend && index == typeArgumentsWithoutReceiverAndReturnType.size - 1) {
-                val parameterType = argument.type(c.typeTable)!!
-                if (parameterType.hasClassName() && parameterType.argumentCount == 1) {
-                    val classId = c.nameResolver.getClassId(parameterType.className)
-                    val fqName = classId.asSingleFqName()
-                    assert(
-                        fqName == FqName("kotlin.coroutines.Continuation") ||
-                                fqName == FqName("kotlin.coroutines.experimental.Continuation")
-                    ) {
-                        "Last parameter type of suspend function must be Continuation, but it is $fqName"
-                    }
-                    suspendParameterType = parameterType
-                    continue
-                }
-            }
-            val parameter = KotlinParameterStubImpl(
-                parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false
-            )
-
-            createTypeReferenceStub(parameter, argument.type(c.typeTable)!!)
-        }
-
-
-        if (suspendParameterType == null) {
-            val returnType = typeArgumentList.last().type(c.typeTable)!!
-            createTypeReferenceStub(functionType, returnType)
-        } else {
-            val continuationArgumentType = suspendParameterType.getArgument(0).type(c.typeTable)!!
-            createTypeReferenceStub(functionType, continuationArgumentType)
-        }
-    }
-
-    fun createValueParameterListStub(
-        parent: StubElement<out PsiElement>,
-        callableProto: MessageLite,
-        parameters: List<ProtoBuf.ValueParameter>,
-        container: ProtoContainer
-    ) {
-        val parameterListStub = KotlinPlaceHolderStubImpl<KtParameterList>(parent, KtStubElementTypes.VALUE_PARAMETER_LIST)
-        for ((index, valueParameterProto) in parameters.withIndex()) {
-            val name = c.nameResolver.getName(valueParameterProto.name)
-            val parameterStub = KotlinParameterStubImpl(
-                parameterListStub,
-                name = name.ref(),
-                fqName = null,
-                hasDefaultValue = false,
-                hasValOrVar = false,
-                isMutable = false
-            )
-            val varargElementType = valueParameterProto.varargElementType(c.typeTable)
-            val typeProto = varargElementType ?: valueParameterProto.type(c.typeTable)
-            val modifiers = arrayListOf<KtModifierKeywordToken>()
-
-            if (varargElementType != null) {
-                modifiers.add(KtTokens.VARARG_KEYWORD)
-            }
-            if (Flags.IS_CROSSINLINE.get(valueParameterProto.flags)) {
-                modifiers.add(KtTokens.CROSSINLINE_KEYWORD)
-            }
-            if (Flags.IS_NOINLINE.get(valueParameterProto.flags)) {
-                modifiers.add(KtTokens.NOINLINE_KEYWORD)
-            }
-
-            val modifierList = createModifierListStub(parameterStub, modifiers)
-
-            if (Flags.HAS_ANNOTATIONS.get(valueParameterProto.flags)) {
-                val parameterAnnotations = c.components.annotationLoader.loadValueParameterAnnotations(
-                    container, callableProto, callableProto.annotatedCallableKind, index, valueParameterProto
-                )
-                if (parameterAnnotations.isNotEmpty()) {
-                    createAnnotationStubs(parameterAnnotations, modifierList ?: createEmptyModifierListStub(parameterStub))
-                }
-            }
-
-            createTypeReferenceStub(parameterStub, typeProto)
-        }
-    }
-
-    fun createTypeParameterListStub(
-        parent: StubElement<out PsiElement>,
-        typeParameterProtoList: List<ProtoBuf.TypeParameter>
-    ): List<Pair<Name, Type>> {
-        if (typeParameterProtoList.isEmpty()) return listOf()
-
-        val typeParameterListStub = KotlinPlaceHolderStubImpl<KtTypeParameterList>(parent, KtStubElementTypes.TYPE_PARAMETER_LIST)
-        val protosForTypeConstraintList = arrayListOf<Pair<Name, Type>>()
-        for (proto in typeParameterProtoList) {
-            val name = c.nameResolver.getName(proto.name)
-            val typeParameterStub = KotlinTypeParameterStubImpl(
-                typeParameterListStub,
-                name = name.ref(),
-                isInVariance = proto.variance == Variance.IN,
-                isOutVariance = proto.variance == Variance.OUT
-            )
-            createTypeParameterModifierListStub(typeParameterStub, proto)
-            val upperBoundProtos = proto.upperBounds(c.typeTable)
-            if (upperBoundProtos.isNotEmpty()) {
-                val upperBound = upperBoundProtos.first()
-                if (!upperBound.isDefaultUpperBound()) {
-                    createTypeReferenceStub(typeParameterStub, upperBound)
-                }
-                protosForTypeConstraintList.addAll(upperBoundProtos.drop(1).map { Pair(name, it) })
-            }
-        }
-        return protosForTypeConstraintList
-    }
-
-    fun createTypeConstraintListStub(
-        parent: StubElement<out PsiElement>,
-        protosForTypeConstraintList: List<Pair<Name, Type>>
-    ) {
-        if (protosForTypeConstraintList.isEmpty()) {
-            return
-        }
-        val typeConstraintListStub = KotlinPlaceHolderStubImpl<KtTypeConstraintList>(parent, KtStubElementTypes.TYPE_CONSTRAINT_LIST)
-        for ((name, type) in protosForTypeConstraintList) {
-            val typeConstraintStub = KotlinPlaceHolderStubImpl<KtTypeConstraint>(typeConstraintListStub, KtStubElementTypes.TYPE_CONSTRAINT)
-            KotlinNameReferenceExpressionStubImpl(typeConstraintStub, name.ref())
-            createTypeReferenceStub(typeConstraintStub, type)
-        }
-    }
-
-    private fun createTypeParameterModifierListStub(
-        typeParameterStub: KotlinTypeParameterStubImpl,
-        typeParameterProto: ProtoBuf.TypeParameter
-    ) {
-        val modifiers = ArrayList<KtModifierKeywordToken>()
-        when (typeParameterProto.variance) {
-            Variance.IN -> modifiers.add(KtTokens.IN_KEYWORD)
-            Variance.OUT -> modifiers.add(KtTokens.OUT_KEYWORD)
-            Variance.INV -> { /* do nothing */
-            }
-            null -> { /* do nothing */
-            }
-        }
-        if (typeParameterProto.reified) {
-            modifiers.add(KtTokens.REIFIED_KEYWORD)
-        }
-
-        val modifierList = createModifierListStub(typeParameterStub, modifiers)
-
-        val annotations = c.components.annotationLoader.loadTypeParameterAnnotations(typeParameterProto, c.nameResolver)
-        if (annotations.isNotEmpty()) {
-            createAnnotationStubs(
-                annotations,
-                modifierList ?: createEmptyModifierListStub(typeParameterStub)
-            )
-        }
-    }
-
-    private fun Type.isDefaultUpperBound(): Boolean {
-        return this.hasClassName() &&
-                c.nameResolver.getClassId(className).let { StandardNames.FqNames.any == it.asSingleFqName().toUnsafe() } &&
-                this.nullable
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
deleted file mode 100644
index 88da547f2b61..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.psi.PsiElement
-import com.intellij.psi.stubs.StubElement
-import com.intellij.util.io.StringRef
-import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.FlagsToModifiers
-import org.jetbrains.kotlin.idea.stubindex.KotlinFileStubForIde
-import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
-import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
-import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.TypeTable
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
-import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
-import org.jetbrains.kotlin.psi.stubs.impl.*
-import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-
-fun createTopLevelClassStub(
-    classId: ClassId,
-    classProto: ProtoBuf.Class,
-    source: SourceElement?,
-    context: ClsStubBuilderContext,
-    isScript: Boolean
-): KotlinFileStubImpl {
-    val fileStub = createFileStub(classId.packageFqName, isScript)
-    createClassStub(fileStub, classProto, context.nameResolver, classId, source, context)
-    return fileStub
-}
-
-fun createPackageFacadeStub(
-    packageProto: ProtoBuf.Package,
-    packageFqName: FqName,
-    c: ClsStubBuilderContext
-): KotlinFileStubImpl {
-    val fileStub = KotlinFileStubForIde.forFile(packageFqName, isScript = false)
-    setupFileStub(fileStub, packageFqName)
-    createPackageDeclarationsStubs(
-        fileStub, c, ProtoContainer.Package(packageFqName, c.nameResolver, c.typeTable, source = null), packageProto
-    )
-    return fileStub
-}
-
-fun createFileFacadeStub(
-    packageProto: ProtoBuf.Package,
-    facadeFqName: FqName,
-    c: ClsStubBuilderContext
-): KotlinFileStubImpl {
-    val packageFqName = facadeFqName.parent()
-    val fileStub = KotlinFileStubForIde.forFileFacadeStub(facadeFqName)
-    setupFileStub(fileStub, packageFqName)
-    val container = ProtoContainer.Package(
-        packageFqName, c.nameResolver, c.typeTable,
-        JvmPackagePartSource(JvmClassName.byClassId(ClassId.topLevel(facadeFqName)), null, packageProto, c.nameResolver)
-    )
-    createPackageDeclarationsStubs(fileStub, c, container, packageProto)
-    return fileStub
-}
-
-fun createMultifileClassStub(
-    header: KotlinClassHeader,
-    partFiles: List<KotlinJvmBinaryClass>,
-    facadeFqName: FqName,
-    components: ClsStubBuilderComponents
-): KotlinFileStubImpl {
-    val packageFqName = header.packageName?.let { FqName(it) } ?: facadeFqName.parent()
-    val partNames = header.data?.asList()?.map { it.substringAfterLast('/') }
-    val fileStub = KotlinFileStubForIde.forMultifileClassStub(packageFqName, facadeFqName, partNames)
-    setupFileStub(fileStub, packageFqName)
-    for (partFile in partFiles) {
-        val partHeader = partFile.classHeader
-        val (nameResolver, packageProto) = JvmProtoBufUtil.readPackageDataFrom(partHeader.data!!, partHeader.strings!!)
-        val partContext = components.createContext(nameResolver, packageFqName, TypeTable(packageProto.typeTable))
-        val container = ProtoContainer.Package(
-            packageFqName, partContext.nameResolver, partContext.typeTable,
-            JvmPackagePartSource(partFile, packageProto, nameResolver)
-        )
-        createPackageDeclarationsStubs(fileStub, partContext, container, packageProto)
-    }
-    return fileStub
-}
-
-fun createIncompatibleAbiVersionFileStub() = createFileStub(FqName.ROOT, isScript = false)
-
-fun createFileStub(packageFqName: FqName, isScript: Boolean): KotlinFileStubImpl {
-    val fileStub = KotlinFileStubForIde.forFile(packageFqName, isScript)
-    setupFileStub(fileStub, packageFqName)
-    return fileStub
-}
-
-private fun setupFileStub(fileStub: KotlinFileStubImpl, packageFqName: FqName) {
-    val packageDirectiveStub = KotlinPlaceHolderStubImpl<KtPackageDirective>(fileStub, KtStubElementTypes.PACKAGE_DIRECTIVE)
-    createStubForPackageName(packageDirectiveStub, packageFqName)
-    KotlinPlaceHolderStubImpl<KtImportList>(fileStub, KtStubElementTypes.IMPORT_LIST)
-}
-
-fun createStubForPackageName(packageDirectiveStub: KotlinPlaceHolderStubImpl<KtPackageDirective>, packageFqName: FqName) {
-    val segments = packageFqName.pathSegments()
-    val iterator = segments.listIterator(segments.size)
-
-    fun recCreateStubForPackageName(current: StubElement<out PsiElement>) {
-        when (iterator.previousIndex()) {
-            -1 -> return
-            0 -> {
-                KotlinNameReferenceExpressionStubImpl(current, iterator.previous().ref())
-                return
-            }
-            else -> {
-                val lastSegment = iterator.previous()
-                val receiver = KotlinPlaceHolderStubImpl<KtDotQualifiedExpression>(current, KtStubElementTypes.DOT_QUALIFIED_EXPRESSION)
-                recCreateStubForPackageName(receiver)
-                KotlinNameReferenceExpressionStubImpl(receiver, lastSegment.ref())
-            }
-        }
-    }
-
-    recCreateStubForPackageName(packageDirectiveStub)
-}
-
-fun createStubForTypeName(
-    typeClassId: ClassId,
-    parent: StubElement<out PsiElement>,
-    bindTypeArguments: (KotlinUserTypeStub, Int) -> Unit = { _, _ -> }
-): KotlinUserTypeStub {
-    val substituteWithAny = typeClassId.isLocal
-
-    val fqName = if (substituteWithAny) StandardNames.FqNames.any
-    else typeClassId.asSingleFqName().toUnsafe()
-
-    val segments = fqName.pathSegments().asReversed()
-    assert(segments.isNotEmpty())
-
-    fun recCreateStubForType(current: StubElement<out PsiElement>, level: Int): KotlinUserTypeStub {
-        val lastSegment = segments[level]
-        val userTypeStub = KotlinUserTypeStubImpl(current)
-        if (level + 1 < segments.size) {
-            recCreateStubForType(userTypeStub, level + 1)
-        }
-        KotlinNameReferenceExpressionStubImpl(userTypeStub, lastSegment.ref())
-        if (!substituteWithAny) {
-            bindTypeArguments(userTypeStub, level)
-        }
-        return userTypeStub
-    }
-
-    return recCreateStubForType(parent, level = 0)
-}
-
-fun createModifierListStubForDeclaration(
-    parent: StubElement<out PsiElement>,
-    flags: Int,
-    flagsToTranslate: List<FlagsToModifiers> = listOf(),
-    additionalModifiers: List<KtModifierKeywordToken> = listOf()
-): KotlinModifierListStubImpl {
-    assert(flagsToTranslate.isNotEmpty())
-
-    val modifiers = flagsToTranslate.mapNotNull { it.getModifiers(flags) } + additionalModifiers
-    return createModifierListStub(parent, modifiers)!!
-}
-
-fun createModifierListStub(
-    parent: StubElement<out PsiElement>,
-    modifiers: Collection<KtModifierKeywordToken>
-): KotlinModifierListStubImpl? {
-    if (modifiers.isEmpty()) {
-        return null
-    }
-    return KotlinModifierListStubImpl(
-        parent,
-        ModifierMaskUtils.computeMask { it in modifiers },
-        KtStubElementTypes.MODIFIER_LIST
-    )
-}
-
-fun createEmptyModifierListStub(parent: KotlinStubBaseImpl<*>): KotlinModifierListStubImpl {
-    return KotlinModifierListStubImpl(
-        parent,
-        ModifierMaskUtils.computeMask { false },
-        KtStubElementTypes.MODIFIER_LIST
-    )
-}
-
-fun createAnnotationStubs(annotationIds: List<ClassId>, parent: KotlinStubBaseImpl<*>) {
-    return createTargetedAnnotationStubs(annotationIds.map { ClassIdWithTarget(it, null) }, parent)
-}
-
-fun createTargetedAnnotationStubs(
-    annotationIds: List<ClassIdWithTarget>,
-    parent: KotlinStubBaseImpl<*>
-) {
-    if (annotationIds.isEmpty()) return
-
-    annotationIds.forEach { annotation ->
-        val (annotationClassId, target) = annotation
-        val annotationEntryStubImpl = KotlinAnnotationEntryStubImpl(
-            parent,
-            shortName = annotationClassId.shortClassName.ref(),
-            hasValueArguments = false
-        )
-        if (target != null) {
-            KotlinAnnotationUseSiteTargetStubImpl(annotationEntryStubImpl, StringRef.fromString(target.name)!!)
-        }
-        val constructorCallee =
-            KotlinPlaceHolderStubImpl<KtConstructorCalleeExpression>(annotationEntryStubImpl, KtStubElementTypes.CONSTRUCTOR_CALLEE)
-        val typeReference = KotlinPlaceHolderStubImpl<KtTypeReference>(constructorCallee, KtStubElementTypes.TYPE_REFERENCE)
-        createStubForTypeName(annotationClassId, typeReference)
-    }
-}
-
-val MessageLite.annotatedCallableKind: AnnotatedCallableKind
-    get() = when (this) {
-        is ProtoBuf.Property -> AnnotatedCallableKind.PROPERTY
-        is ProtoBuf.Function, is ProtoBuf.Constructor -> AnnotatedCallableKind.FUNCTION
-        else -> throw IllegalStateException("Unsupported message: $this")
-    }
-
-fun Name.ref() = StringRef.fromString(this.asString())!!
-
-fun FqName.ref() = StringRef.fromString(this.asString())!!
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt
deleted file mode 100644
index 542a783ee3ad..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags
-
-import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
-import org.jetbrains.kotlin.lexer.KtToken
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-
-abstract class FlagsToModifiers {
-    abstract fun getModifiers(flags: Int): KtModifierKeywordToken?
-}
-
-val MODALITY: FlagsToModifiers = object : FlagsToModifiers() {
-    override fun getModifiers(flags: Int): KtModifierKeywordToken {
-        val modality = Flags.MODALITY.get(flags)
-        return when (modality) {
-            ProtoBuf.Modality.ABSTRACT -> KtTokens.ABSTRACT_KEYWORD
-            ProtoBuf.Modality.FINAL -> KtTokens.FINAL_KEYWORD
-            ProtoBuf.Modality.OPEN -> KtTokens.OPEN_KEYWORD
-            ProtoBuf.Modality.SEALED -> KtTokens.SEALED_KEYWORD
-            null -> throw IllegalStateException("Unexpected modality: null")
-        }
-    }
-}
-
-val VISIBILITY: FlagsToModifiers = object : FlagsToModifiers() {
-    override fun getModifiers(flags: Int): KtModifierKeywordToken? {
-        val visibility = Flags.VISIBILITY.get(flags)
-        return when (visibility) {
-            ProtoBuf.Visibility.PRIVATE, ProtoBuf.Visibility.PRIVATE_TO_THIS -> KtTokens.PRIVATE_KEYWORD
-            ProtoBuf.Visibility.INTERNAL -> KtTokens.INTERNAL_KEYWORD
-            ProtoBuf.Visibility.PROTECTED -> KtTokens.PROTECTED_KEYWORD
-            ProtoBuf.Visibility.PUBLIC -> KtTokens.PUBLIC_KEYWORD
-            else -> throw IllegalStateException("Unexpected visibility: $visibility")
-        }
-    }
-}
-
-val INNER = createBooleanFlagToModifier(Flags.IS_INNER, KtTokens.INNER_KEYWORD)
-val CONST = createBooleanFlagToModifier(Flags.IS_CONST, KtTokens.CONST_KEYWORD)
-val LATEINIT = createBooleanFlagToModifier(Flags.IS_LATEINIT, KtTokens.LATEINIT_KEYWORD)
-val OPERATOR = createBooleanFlagToModifier(Flags.IS_OPERATOR, KtTokens.OPERATOR_KEYWORD)
-val INFIX = createBooleanFlagToModifier(Flags.IS_INFIX, KtTokens.INFIX_KEYWORD)
-val DATA = createBooleanFlagToModifier(Flags.IS_DATA, KtTokens.DATA_KEYWORD)
-val EXTERNAL_FUN = createBooleanFlagToModifier(Flags.IS_EXTERNAL_FUNCTION, KtTokens.EXTERNAL_KEYWORD)
-val EXTERNAL_PROPERTY = createBooleanFlagToModifier(Flags.IS_EXTERNAL_PROPERTY, KtTokens.EXTERNAL_KEYWORD)
-val EXTERNAL_CLASS = createBooleanFlagToModifier(Flags.IS_EXTERNAL_CLASS, KtTokens.EXTERNAL_KEYWORD)
-val INLINE = createBooleanFlagToModifier(Flags.IS_INLINE, KtTokens.INLINE_KEYWORD)
-val VALUE_CLASS = createBooleanFlagToModifier(Flags.IS_INLINE_CLASS, KtTokens.VALUE_KEYWORD)
-val FUN_INTERFACE = createBooleanFlagToModifier(Flags.IS_FUN_INTERFACE, KtTokens.FUN_KEYWORD)
-val TAILREC = createBooleanFlagToModifier(Flags.IS_TAILREC, KtTokens.TAILREC_KEYWORD)
-val SUSPEND = createBooleanFlagToModifier(Flags.IS_SUSPEND, KtTokens.SUSPEND_KEYWORD)
-
-private fun createBooleanFlagToModifier(
-    flagField: Flags.BooleanFlagField, ktModifierKeywordToken: KtModifierKeywordToken
-): FlagsToModifiers = BooleanFlagToModifier(flagField, ktModifierKeywordToken)
-
-private class BooleanFlagToModifier(
-    private val flagField: Flags.BooleanFlagField,
-    private val ktModifierKeywordToken: KtModifierKeywordToken
-) : FlagsToModifiers() {
-    override fun getModifiers(flags: Int): KtModifierKeywordToken? = if (flagField.get(flags)) ktModifierKeywordToken else null
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt
deleted file mode 100644
index 0eb4d41a61e3..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder
-
-import com.intellij.psi.PsiElement
-import com.intellij.psi.stubs.StubElement
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.VISIBILITY
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
-import org.jetbrains.kotlin.metadata.deserialization.underlyingType
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeAliasStubImpl
-import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.serialization.deserialization.getName
-
-fun createTypeAliasStub(
-    parent: StubElement<out PsiElement>,
-    typeAliasProto: ProtoBuf.TypeAlias,
-    protoContainer: ProtoContainer,
-    outerContext: ClsStubBuilderContext
-) {
-    val c = outerContext.child(typeAliasProto.typeParameterList)
-    val shortName = c.nameResolver.getName(typeAliasProto.name)
-
-    val classId = when (protoContainer) {
-        is ProtoContainer.Class -> protoContainer.classId.createNestedClassId(shortName)
-        is ProtoContainer.Package -> ClassId.topLevel(protoContainer.fqName.child(shortName))
-    }
-
-    val typeAlias = KotlinTypeAliasStubImpl(
-        parent, classId.shortClassName.ref(), classId.asSingleFqName().ref(), classId,
-        isTopLevel = !classId.isNestedClass
-    )
-
-    val modifierList = createModifierListStubForDeclaration(typeAlias, typeAliasProto.flags, arrayListOf(VISIBILITY), listOf())
-
-    val typeStubBuilder = TypeClsStubBuilder(c)
-    val restConstraints = typeStubBuilder.createTypeParameterListStub(typeAlias, typeAliasProto.typeParameterList)
-    assert(restConstraints.isEmpty()) {
-        "'where' constraints are not allowed for type aliases"
-    }
-
-    if (Flags.HAS_ANNOTATIONS.get(typeAliasProto.flags)) {
-        createAnnotationStubs(typeAliasProto.annotationList.map { c.nameResolver.getClassId(it.id) }, modifierList)
-    }
-
-    val typeAliasUnderlyingType = typeAliasProto.underlyingType(c.typeTable)
-    typeStubBuilder.createTypeReferenceStub(typeAlias, typeAliasUnderlyingType)
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt
deleted file mode 100644
index c7daf97dbfbc..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledText.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.textBuilder
-
-import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.utils.keysToMap
-
-data class DecompiledText(val text: String, val index: DecompiledTextIndex)
-
-interface DecompiledTextIndexer<out T : Any> {
-    fun indexDescriptor(descriptor: DeclarationDescriptor): Collection<T>
-}
-
-// In-memory HashMap-based index of decompiled text
-// allows navigation features
-class DecompiledTextIndex(private val indexers: Collection<DecompiledTextIndexer<*>>) {
-    private val indexerToMap: Map<DecompiledTextIndexer<*>, MutableMap<Any, TextRange>> = indexers.keysToMap { hashMapOf<Any, TextRange>() }
-
-    fun addToIndex(descriptor: DeclarationDescriptor, textRange: TextRange) {
-        indexers.forEach { mapper ->
-            val correspondingMap = indexerToMap.getValue(mapper)
-            mapper.indexDescriptor(descriptor).forEach { key ->
-                correspondingMap[key] = textRange
-            }
-        }
-    }
-
-    fun <T : Any> getRange(mapper: DecompiledTextIndexer<T>, key: T): TextRange? = indexerToMap[mapper]?.get(key)
-
-    companion object {
-        val Empty = DecompiledTextIndex(listOf())
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
deleted file mode 100644
index 69a8a301d120..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompilerBase.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.textBuilder
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
-import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
-import org.jetbrains.kotlin.descriptors.PackageFragmentProviderOptimized
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
-import org.jetbrains.kotlin.serialization.deserialization.LocalClassifierTypeSettings
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.types.SimpleType
-
-abstract class DeserializerForDecompilerBase(val directoryPackageFqName: FqName) : ResolverForDecompiler {
-    protected abstract val deserializationComponents: DeserializationComponents
-
-    protected abstract val builtIns: KotlinBuiltIns
-
-    protected val storageManager: StorageManager = LockBasedStorageManager.NO_LOCKS
-
-    protected val moduleDescriptor: ModuleDescriptorImpl = createDummyModule("module for building decompiled sources")
-
-    protected val packageFragmentProvider: PackageFragmentProvider = object : PackageFragmentProviderOptimized {
-        override fun collectPackageFragments(fqName: FqName, packageFragments: MutableCollection<PackageFragmentDescriptor>) {
-            packageFragments.add(createDummyPackageFragment(fqName))
-        }
-
-        override fun isEmpty(fqName: FqName): Boolean = false
-
-        override fun getPackageFragments(fqName: FqName): List<PackageFragmentDescriptor> {
-            return listOf(createDummyPackageFragment(fqName))
-        }
-
-        override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName> {
-            throw UnsupportedOperationException("This method is not supposed to be called.")
-        }
-    }
-
-    override fun resolveTopLevelClass(classId: ClassId) = deserializationComponents.deserializeClass(classId)
-
-    protected fun createDummyPackageFragment(fqName: FqName): MutablePackageFragmentDescriptor =
-        MutablePackageFragmentDescriptor(moduleDescriptor, fqName)
-
-    private fun createDummyModule(name: String) = ModuleDescriptorImpl(Name.special("<$name>"), storageManager, builtIns)
-
-    init {
-        moduleDescriptor.initialize(packageFragmentProvider)
-        moduleDescriptor.setDependencies(moduleDescriptor, moduleDescriptor.builtIns.builtInsModule)
-    }
-}
-
-class ResolveEverythingToKotlinAnyLocalClassifierResolver(private val builtIns: KotlinBuiltIns) : LocalClassifierTypeSettings {
-    override val replacementTypeForLocalClassifiers: SimpleType?
-        get() = builtIns.anyType
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt
deleted file mode 100644
index 0cabb3f43859..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.textBuilder
-
-import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
-
-class LoggingErrorReporter(private val log: Logger) : ErrorReporter {
-    override fun reportIncompleteHierarchy(descriptor: ClassDescriptor, unresolvedSuperClasses: List<String>) {
-        // This is absolutely fine for the decompiler
-    }
-
-    override fun reportCannotInferVisibility(descriptor: CallableMemberDescriptor) {
-        log.error("Could not infer visibility for $descriptor")
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.kt
deleted file mode 100644
index 13375d1b1c32..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.textBuilder
-
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.name.ClassId
-
-interface ResolverForDecompiler {
-    fun resolveTopLevelClass(classId: ClassId): ClassDescriptor?
-
-    fun resolveDeclarationsInFacade(facadeFqName: FqName): List<DeclarationDescriptor>
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt
deleted file mode 100644
index 45031ab6456a..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/buildDecompiledText.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.textBuilder
-
-import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.contracts.description.ContractProviderKey
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.core.quoteIfNeeded
-import org.jetbrains.kotlin.idea.decompiler.navigation.ByDescriptorIndexer
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
-import org.jetbrains.kotlin.renderer.DescriptorRendererOptions
-import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
-import org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry
-import org.jetbrains.kotlin.resolve.descriptorUtil.secondaryConstructors
-import org.jetbrains.kotlin.types.isFlexible
-
-private const val DECOMPILED_CODE_COMMENT = "/* compiled code */"
-private const val DECOMPILED_COMMENT_FOR_PARAMETER = "/* = compiled code */"
-private const val FLEXIBLE_TYPE_COMMENT = "/* platform type */"
-private const val DECOMPILED_CONTRACT_STUB = "contract { /* compiled contract */ }"
-
-fun DescriptorRendererOptions.defaultDecompilerRendererOptions() {
-    withDefinedIn = false
-    classWithPrimaryConstructor = true
-    secondaryConstructorsAsPrimary = false
-    modifiers = DescriptorRendererModifier.ALL
-    excludedTypeAnnotationClasses = emptySet()
-    alwaysRenderModifiers = true
-    parameterNamesInFunctionalTypes = false // to support parameters names in decompiled text we need to load annotation arguments
-}
-
-fun buildDecompiledText(
-    packageFqName: FqName,
-    descriptors: List<DeclarationDescriptor>,
-    descriptorRenderer: DescriptorRenderer,
-    indexers: Collection<DecompiledTextIndexer<*>> = listOf(ByDescriptorIndexer)
-): DecompiledText {
-    val builder = StringBuilder()
-
-    fun appendDecompiledTextAndPackageName() {
-        builder.append("// IntelliJ API Decompiler stub source generated from a class file\n" + "// Implementation of methods is not available")
-        builder.append("\n\n")
-        if (!packageFqName.isRoot) {
-            builder.append("package ").append(packageFqName.quoteIfNeeded()).append("\n\n")
-        }
-    }
-
-    val textIndex = DecompiledTextIndex(indexers)
-
-    fun indexDescriptor(descriptor: DeclarationDescriptor, startOffset: Int, endOffset: Int) {
-        textIndex.addToIndex(descriptor, TextRange(startOffset, endOffset))
-    }
-
-    fun CallableMemberDescriptor.isConsideredSynthetic(): Boolean {
-        return when (kind) {
-            CallableMemberDescriptor.Kind.DECLARATION -> false
-
-            CallableMemberDescriptor.Kind.FAKE_OVERRIDE,
-            CallableMemberDescriptor.Kind.DELEGATION -> true
-
-            CallableMemberDescriptor.Kind.SYNTHESIZED -> {
-                // Of all synthesized functions, only `component*` functions are rendered (for historical reasons)
-                !DataClassDescriptorResolver.isComponentLike(name)
-            }
-        }
-    }
-
-    fun appendDescriptor(descriptor: DeclarationDescriptor, indent: String, lastEnumEntry: Boolean? = null) {
-        val startOffset = builder.length
-        if (isEnumEntry(descriptor)) {
-            for (annotation in descriptor.annotations) {
-                builder.append(descriptorRenderer.renderAnnotation(annotation))
-                builder.append(" ")
-            }
-            builder.append(descriptor.name.asString().quoteIfNeeded())
-            builder.append(if (lastEnumEntry!!) ";" else ",")
-        } else {
-            builder.append(descriptorRenderer.render(descriptor).replace("= ...", DECOMPILED_COMMENT_FOR_PARAMETER))
-        }
-        var endOffset = builder.length
-
-        if (descriptor is CallableDescriptor) {
-            //NOTE: assuming that only return types can be flexible
-            if (descriptor.returnType!!.isFlexible()) {
-                builder.append(" ").append(FLEXIBLE_TYPE_COMMENT)
-            }
-        }
-
-        if (descriptor is FunctionDescriptor || descriptor is PropertyDescriptor) {
-            if ((descriptor as MemberDescriptor).modality != Modality.ABSTRACT) {
-                if (descriptor is FunctionDescriptor) {
-                    with(builder) {
-                        append(" { ")
-                        if (descriptor.getUserData(ContractProviderKey)?.getContractDescription() != null) {
-                            append(DECOMPILED_CONTRACT_STUB).append("; ")
-                        }
-                        append(DECOMPILED_CODE_COMMENT).append(" }")
-                    }
-                } else {
-                    // descriptor instanceof PropertyDescriptor
-                    builder.append(" ").append(DECOMPILED_CODE_COMMENT)
-                }
-                endOffset = builder.length
-            }
-        } else if (descriptor is ClassDescriptor && !isEnumEntry(descriptor)) {
-            builder.append(" {\n")
-
-            val subindent = "$indent    "
-
-            var firstPassed = false
-            fun newlineExceptFirst() {
-                if (firstPassed) {
-                    builder.append("\n")
-                } else {
-                    firstPassed = true
-                }
-            }
-
-            val allDescriptors = descriptor.secondaryConstructors + descriptor.defaultType.memberScope.getContributedDescriptors()
-            val (enumEntries, members) = allDescriptors.partition(::isEnumEntry)
-
-            for ((index, enumEntry) in enumEntries.withIndex()) {
-                newlineExceptFirst()
-                builder.append(subindent)
-                appendDescriptor(enumEntry, subindent, index == enumEntries.lastIndex)
-            }
-
-            val companionObject = descriptor.companionObjectDescriptor
-            if (companionObject != null) {
-                newlineExceptFirst()
-                builder.append(subindent)
-                appendDescriptor(companionObject, subindent)
-            }
-
-            for (member in members) {
-                if (member.containingDeclaration != descriptor) {
-                    continue
-                }
-                if (member == companionObject) {
-                    continue
-                }
-                if (member is CallableMemberDescriptor && member.isConsideredSynthetic()) {
-                    continue
-                }
-                newlineExceptFirst()
-                builder.append(subindent)
-                appendDescriptor(member, subindent)
-            }
-
-            builder.append(indent).append("}")
-            endOffset = builder.length
-        }
-
-        builder.append("\n")
-        indexDescriptor(descriptor, startOffset, endOffset)
-
-        if (descriptor is ClassDescriptor) {
-            val primaryConstructor = descriptor.unsubstitutedPrimaryConstructor
-            if (primaryConstructor != null) {
-                indexDescriptor(primaryConstructor, startOffset, endOffset)
-            }
-        }
-    }
-
-    appendDecompiledTextAndPackageName()
-    for (member in descriptors) {
-        appendDescriptor(member, "")
-        builder.append("\n")
-    }
-
-    return DecompiledText(builder.toString(), textIndex)
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
index 88ef2ba03a61..ec4c1edabdfd 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProvider.kt
@@ -23,7 +23,7 @@ interface KotlinVersionInfoProvider {
     fun getCompilerVersion(module: Module): String?
     fun getLibraryVersions(
         module: Module,
-        platformKind: IdePlatformKind<*>,
+        platformKind: IdePlatformKind,
         rootModel: ModuleRootModel?
     ): Collection<String>
 }
@@ -31,7 +31,7 @@ interface KotlinVersionInfoProvider {
 fun getRuntimeLibraryVersions(
     module: Module,
     rootModel: ModuleRootModel?,
-    platformKind: IdePlatformKind<*>
+    platformKind: IdePlatformKind
 ): Collection<String> {
     return KotlinVersionInfoProvider.EP_NAME.extensionList.asSequence()
         .map { it.getLibraryVersions(module, platformKind, rootModel) }
@@ -41,14 +41,14 @@ fun getRuntimeLibraryVersions(
 fun getLibraryLanguageLevel(
     module: Module,
     rootModel: ModuleRootModel?,
-    platformKind: IdePlatformKind<*>?,
+    platformKind: IdePlatformKind?,
     coerceRuntimeLibraryVersionToReleased: Boolean = true
 ) = getLibraryVersion(module, rootModel, platformKind, coerceRuntimeLibraryVersionToReleased).languageVersion
 
 fun getLibraryVersion(
     module: Module,
     rootModel: ModuleRootModel?,
-    platformKind: IdePlatformKind<*>?,
+    platformKind: IdePlatformKind?,
     coerceRuntimeLibraryVersionToReleased: Boolean = true
 ): Version {
     val minVersion = getRuntimeLibraryVersions(module, rootModel, platformKind.orDefault())
@@ -77,7 +77,7 @@ fun getDefaultLanguageLevel(
 ) = getDefaultVersion(module, explicitVersion, coerceRuntimeLibraryVersionToReleased).languageVersion
 
 fun String?.toLanguageVersion(): LanguageVersion = when {
-    this == null -> VersionView.RELEASED_VERSION
+    this == null -> LanguageVersion.LATEST_STABLE
     startsWith("1.9") -> LanguageVersion.KOTLIN_1_9
     startsWith("1.8") -> LanguageVersion.KOTLIN_1_8
     startsWith("1.7") -> LanguageVersion.KOTLIN_1_7
@@ -88,13 +88,13 @@ fun String?.toLanguageVersion(): LanguageVersion = when {
     startsWith("1.2") -> LanguageVersion.KOTLIN_1_2
     startsWith("1.1") -> LanguageVersion.KOTLIN_1_1
     startsWith("1.0") -> LanguageVersion.KOTLIN_1_0
-    else -> VersionView.RELEASED_VERSION
+    else -> LanguageVersion.LATEST_STABLE
 }
 
 fun String?.toApiVersion(): ApiVersion = ApiVersion.createByLanguageVersion(toLanguageVersion())
 
 private fun Iterable<String>.addReleaseVersionIfNecessary(shouldAdd: Boolean): Iterable<String> =
-    if (shouldAdd) this + VersionView.RELEASED_VERSION.versionString else this
+    if (shouldAdd) this + LanguageVersion.LATEST_STABLE.versionString else this
 
 fun getRuntimeLibraryVersion(module: Module): String? {
     val settingsProvider = KotlinFacetSettingsProvider.getInstance(module.project) ?: return null
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt
index cf8749a3641b..c39cf97567ad 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt
@@ -201,7 +201,7 @@ internal class ElementAnnotator(
                 moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::useIR) &&
                         !moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::useOldBackend)
             Errors.FIR_COMPILED_CLASS ->
-                moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::useFir)
+                moduleFacetSettings.isCompilerSettingPresent(K2JVMCompilerArguments::useK2)
             else -> error(factory)
         }
     }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
index c989dee48971..93a71c9cbcf4 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.kt
@@ -6,22 +6,14 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.psi.util.parentOfType
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors.*
-import org.jetbrains.kotlin.idea.project.getLanguageVersionSettings
-import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors
-import org.jetbrains.kotlin.idea.util.module
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject
-import org.jetbrains.kotlin.types.DefinitelyNotNullType
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 internal class TypeKindHighlightingVisitor(holder: HighlightInfoHolder, bindingContext: BindingContext) :
     AfterAnalysisHighlightingVisitor(holder, bindingContext) {
@@ -33,13 +25,10 @@ internal class TypeKindHighlightingVisitor(holder: HighlightInfoHolder, bindingC
             return
         }
 
-        val intersectionType = expression.getParentOfType<KtIntersectionType>(strict = true)
-        val resolvedType = bindingContext[BindingContext.TYPE, intersectionType?.parent as? KtTypeReference]
-        if (intersectionType != null && resolvedType is DefinitelyNotNullType) {
-            // Do nothing: this name is a component of a definitely non-nullable type
-            // that will be highlighted as a whole in `visitIntersectionType`
-            return
-        }
+        // Prevent custom highlighting for a name that is a part of a definitely non-nullable type
+        // (the only kind of intersection types that is currently supported by the compiler).
+        // The type is highlighted as a whole in `visitIntersectionType`.
+        if (parent?.parent?.parent?.safeAs<KtIntersectionType>() != null) return
 
         if (!NameHighlighter.namesHighlightingEnabled) return
 
@@ -115,11 +104,8 @@ internal class TypeKindHighlightingVisitor(holder: HighlightInfoHolder, bindingC
     }
 
     override fun visitIntersectionType(type: KtIntersectionType) {
-        val parent = type.parent as? KtTypeReference
-        val kotlinType = bindingContext[BindingContext.TYPE, parent]
-        if (parent != null && kotlinType is DefinitelyNotNullType) {
-            highlightName(parent, TYPE_PARAMETER)
-        }
+        // Currently, the only kind of intersection types is definitely non-nullable type, so highlight it without further analysis
+        type.parent?.safeAs<KtTypeReference>()?.run { highlightName(this, TYPE_PARAMETER) }
         super.visitIntersectionType(type)
     }
 
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt
index b6be92002412..b12aec83ea40 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.resolve.calls.util.hasTypeMismatchErrorOnParameter
 import org.jetbrains.kotlin.resolve.calls.util.hasUnmappedArguments
 import org.jetbrains.kotlin.resolve.calls.components.hasDefaultValue
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 
 private const val RED_TEMPLATE = "<font color=red><b>%s</b></font>"
 private const val STRONG_TEMPLATE = "<b>%s</b>"
@@ -59,7 +59,7 @@ fun renderResolvedCall(resolvedCall: ResolvedCall<*>, context: RenderingContext)
         val parametersToArgumentsMap = resolvedCall.typeArguments
         fun TypeParameterDescriptor.isInferred(): Boolean {
             val typeArgument = parametersToArgumentsMap[this] ?: return false
-            return !ErrorUtils.isUninferredParameter(typeArgument)
+            return !ErrorUtils.isUninferredTypeVariable(typeArgument)
         }
 
         val typeParameters = resolvedCall.candidateDescriptor.typeParameters
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractResultUnusedChecker.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractResultUnusedChecker.kt
index 8097bfc765f9..f24c1e95ff54 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractResultUnusedChecker.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractResultUnusedChecker.kt
@@ -3,7 +3,7 @@
 package org.jetbrains.kotlin.idea.inspections
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsExpression
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
index 39e982074547..936b48408bd3 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocReference.kt
@@ -12,13 +12,12 @@ import org.jetbrains.kotlin.idea.references.KtMultiReference
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocLink
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.kotlin.name.Name
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 class KDocReferenceDescriptorsImpl(element: KDocName) : KDocReference(element), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val declaration = element.getContainingDoc().getOwner() ?: return arrayListOf()
@@ -42,4 +41,8 @@ class KDocReferenceDescriptorsImpl(element: KDocName) : KDocReference(element),
         val newLink = KDocElementFactory(element.project).createNameFromText(newText)
         return element.replace(newLink)
     }
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibDecompiledFile.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibDecompiledFile.kt
index 8b521443d27d..29e28ecc0cdb 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibDecompiledFile.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibDecompiledFile.kt
@@ -3,9 +3,9 @@
 package org.jetbrains.kotlin.idea.klib
 
 import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinDecompiledFileViewProvider
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtDecompiledFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.DecompiledText
 
 class KlibDecompiledFile(
     provider: KotlinDecompiledFileViewProvider,
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
index 37d13ab39796..5da654b8b9e8 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDecompiler.kt
@@ -6,12 +6,12 @@ import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.psi.compiled.ClassFileDecompilers
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinDecompiledFileViewProvider
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.DecompiledText
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.buildDecompiledText
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.createIncompatibleAbiVersionDecompiledText
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.defaultDecompilerRendererOptions
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.common.createIncompatibleAbiVersionDecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
 import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
index 337a4ba9c378..30fcbbc07b68 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataDeserializerForDecompiler.kt
@@ -3,14 +3,15 @@
 package org.jetbrains.kotlin.idea.klib
 
 import com.intellij.openapi.diagnostic.Logger
+import org.jetbrains.kotlin.analysis.decompiler.psi.DeserializerForDecompilerBase
+import org.jetbrains.kotlin.analysis.decompiler.psi.LoggingErrorReporter
+import org.jetbrains.kotlin.analysis.decompiler.psi.ResolveEverythingToKotlinAnyLocalClassifierResolver
 import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataVersion
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.NotFoundClasses
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompilerBase
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotlinAnyLocalClassifierResolver
+
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.library.metadata.KlibMetadataClassDataFinder
 import org.jetbrains.kotlin.metadata.ProtoBuf
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataStubBuilder.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataStubBuilder.kt
index bfc4ce6efe30..f4a43a34cd54 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataStubBuilder.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/klib/KlibMetadataStubBuilder.kt
@@ -8,8 +8,8 @@ import com.intellij.psi.compiled.ClsStubBuilder
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.util.indexing.FileContent
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.createIncompatibleAbiVersionFileStub
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.defaultDecompilerRendererOptions
+import org.jetbrains.kotlin.analysis.decompiler.stub.createIncompatibleAbiVersionFileStub
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
index ca38dda63478..4914065ad72a 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
@@ -113,7 +113,7 @@ fun Project.getLanguageVersionSettings(
     val languageVersion =
         kotlinFacetSettings?.languageLevel ?: LanguageVersion.fromVersionString(arguments.languageVersion)
         ?: contextModule?.getAndCacheLanguageLevelByDependencies()
-        ?: VersionView.RELEASED_VERSION
+        ?: LanguageVersion.LATEST_STABLE
     val apiVersion = ApiVersion.createByLanguageVersion(LanguageVersion.fromVersionString(arguments.apiVersion) ?: languageVersion)
     val compilerSettings = KotlinCompilerSettings.getInstance(this).settings
 
@@ -253,7 +253,7 @@ private fun parseArguments(
 }
 
 fun MutableMap<LanguageFeature, LanguageFeature.State>.configureMultiplatformSupport(
-    platformKind: IdePlatformKind<*>?,
+    platformKind: IdePlatformKind?,
     module: Module?
 ) {
     if (platformKind.isCommon || module?.implementsCommonModule == true) {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReferenceDescriptorsImpl.kt
index 6b99cdec6b96..7bf10f0d4d76 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtArrayAccessReferenceDescriptorsImpl.kt
@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.core.canMoveLambdaOutsideParentheses
 import org.jetbrains.kotlin.idea.core.moveFunctionLiteralOutsideParentheses
 import org.jetbrains.kotlin.psi.KtArrayAccessExpression
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_GET
 import org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET
@@ -14,10 +15,12 @@ import org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET
 internal class KtArrayAccessReferenceDescriptorsImpl(
     expression: KtArrayAccessExpression
 ) : KtArrayAccessReference(expression), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean = super<KtDescriptorsBasedReference>.isReferenceTo(element)
-
     override fun handleElementRename(newElementName: String): PsiElement = renameImplicitConventionalCall(newElementName)
 
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
+
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val getFunctionDescriptor = context[INDEXED_LVALUE_GET, expression]?.candidateDescriptor
         val setFunctionDescriptor = context[INDEXED_LVALUE_SET, expression]?.candidateDescriptor
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReferenceDescriptorsImpl.kt
index 59905d207151..92129d0d661d 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtCollectionLiteralReferenceDescriptorsImpl.kt
@@ -5,16 +5,18 @@ package org.jetbrains.kotlin.idea.references
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.psi.KtCollectionLiteralExpression
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 
 class KtCollectionLiteralReferenceDescriptorsImpl(
     expression: KtCollectionLiteralExpression
 ) : KtCollectionLiteralReference(expression), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
-
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val resolvedCall = context[BindingContext.COLLECTION_LITERAL_CALL, element]
         return listOfNotNull(resolvedCall?.resultingDescriptor)
     }
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReferenceDescriptorsImpl.kt
index 73a8603b59e5..21f2f6271f4f 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtConstructorDelegationReferenceDescriptorsImpl.kt
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.idea.references
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.psi.KtConstructorDelegationReferenceExpression
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getReferenceTargets
 
@@ -10,8 +11,9 @@ class KtConstructorDelegationReferenceDescriptorsImpl(
     expression: KtConstructorDelegationReferenceExpression
 ) : KtConstructorDelegationReference(expression), KtDescriptorsBasedReference {
 
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
-
     override fun getTargetDescriptors(context: BindingContext) = expression.getReferenceTargets(context)
-}
\ No newline at end of file
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
+}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceDescriptorsImpl.kt
index 6ff4b5110ac1..44dc428f2bfd 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtDestructuringDeclarationReferenceDescriptorsImpl.kt
@@ -8,13 +8,12 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.psi.KtDestructuringDeclarationEntry
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 
 class KtDestructuringDeclarationReferenceDescriptorsImpl(
     element: KtDestructuringDeclarationEntry
 ) : KtDestructuringDeclarationReference(element), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         return listOfNotNull(
@@ -29,6 +28,10 @@ class KtDestructuringDeclarationReferenceDescriptorsImpl(
 
     override fun getRangeInElement() = TextRange(0, element.textLength)
 
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
+
     override fun canRename(): Boolean {
         val bindingContext = expression.analyze() //TODO: should it use full body resolve?
         return resolveToDescriptors(bindingContext).all {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceDescriptorsImpl.kt
index c82900e8fcdf..595807a35d8b 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtForLoopInReferenceDescriptorsImpl.kt
@@ -7,14 +7,13 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtForExpression
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
 class KtForLoopInReferenceDescriptorsImpl(
     element: KtForExpression
 ) : KtForLoopInReference(element), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val loopRange = expression.loopRange ?: return emptyList()
@@ -28,4 +27,8 @@ class KtForLoopInReferenceDescriptorsImpl(
             BindingContext.LOOP_RANGE_HAS_NEXT_RESOLVED_CALL
         )
     }
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceDescriptorsImpl.kt
index 2fa813859aa3..dc1646b794ec 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtInvokeFunctionReferenceDescriptorsImpl.kt
@@ -7,15 +7,13 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.psi.Call
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.util.getCall
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
 
 class KtInvokeFunctionReferenceDescriptorsImpl(expression: KtCallExpression) : KtInvokeFunctionReference(expression), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
-
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val call = element.getCall(context)
@@ -32,4 +30,8 @@ class KtInvokeFunctionReferenceDescriptorsImpl(expression: KtCallExpression) : K
 
     override fun doRenameImplicitConventionalCall(newName: String?): KtExpression =
         renameImplicitConventionalCall(newName)
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceDescriptorsImpl.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceDescriptorsImpl.kt
index 839d871edbff..0fce94847726 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceDescriptorsImpl.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtPropertyDelegationMethodsReferenceDescriptorsImpl.kt
@@ -6,6 +6,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptorWithAccessors
 import org.jetbrains.kotlin.descriptors.accessors
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.KtPropertyDelegate
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -14,8 +15,6 @@ import org.jetbrains.kotlin.resolve.BindingContext
 class KtPropertyDelegationMethodsReferenceDescriptorsImpl(
     element: KtPropertyDelegate
 ) : KtPropertyDelegationMethodsReference(element), KtDescriptorsBasedReference {
-    override fun isReferenceTo(element: PsiElement): Boolean =
-        super<KtDescriptorsBasedReference>.isReferenceTo(element)
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val property = expression.getStrictParentOfType<KtProperty>() ?: return emptyList()
@@ -25,4 +24,8 @@ class KtPropertyDelegationMethodsReferenceDescriptorsImpl(
             context.get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, accessor)?.candidateDescriptor
         } + listOfNotNull(context.get(BindingContext.PROVIDE_DELEGATE_RESOLVED_CALL, descriptor)?.candidateDescriptor)
     }
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
index afd3fda50d60..1995aa61403a 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtReference.kt
@@ -6,11 +6,14 @@ import com.intellij.psi.*
 import com.intellij.psi.impl.source.resolve.ResolveCache
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
-import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyze
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.util.application.runWithCancellationCheck
+import org.jetbrains.kotlin.psi.KtConstructor
+import org.jetbrains.kotlin.psi.KtImportAlias
 import org.jetbrains.kotlin.psi.KtReferenceExpression
+import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import java.util.*
@@ -24,8 +27,25 @@ interface KtDescriptorsBasedReference : KtReference {
 
     fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor>
 
-    override fun isReferenceTo(element: PsiElement): Boolean {
-        return matchesTarget(element)
+    fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        val importDirective = alias.importDirective ?: return false
+        val importedFqName = importDirective.importedFqName ?: return false
+        val importedDescriptors = importDirective.containingKtFile.resolveImportReference(importedFqName)
+        val importableTargets = unwrappedTargets.mapNotNull {
+            when {
+                it is KtConstructor<*> -> it.containingClassOrObject
+                it is PsiMethod && it.isConstructor -> it.containingClass
+                else -> it
+            }
+        }
+
+        val project = element.project
+        val resolveScope = element.resolveScope
+        return importedDescriptors.any {
+            it.findPsiDeclarations(project, resolveScope).any { declaration ->
+                declaration in importableTargets
+            }
+        }
     }
 }
 
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
index c2ce8d20b8f7..76459386c20b 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
@@ -2,7 +2,6 @@
 
 package org.jetbrains.kotlin.idea.references
 
-import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.IncorrectOperationException
@@ -16,6 +15,7 @@ import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet
 import org.jetbrains.kotlin.idea.core.*
 import org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
+import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.idea.util.application.isDispatchThread
 import org.jetbrains.kotlin.lexer.KtToken
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -39,8 +39,14 @@ class KtSimpleNameReferenceDescriptorsImpl(
     expression: KtSimpleNameExpression
 ) : KtSimpleNameReference(expression), KtDescriptorsBasedReference {
 
-    override fun doCanBeReferenceTo(candidateTarget: PsiElement): Boolean =
-        canBeReferenceTo(candidateTarget)
+    override fun canBeReferenceTo(candidateTarget: PsiElement): Boolean {
+        return element.containingFile == candidateTarget.containingFile
+                || ProjectRootsUtil.isInProjectOrLibSource(element, includeScriptsOutsideSourceRoots = true)
+    }
+
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
 
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         return SmartList<DeclarationDescriptor>().apply {
@@ -68,29 +74,11 @@ class KtSimpleNameReferenceDescriptorsImpl(
         }
     }
 
-    override fun isReferenceTo(element: PsiElement): Boolean {
-        if (!canBeReferenceTo(element)) return false
-
+    override fun isReferenceToViaExtension(element: PsiElement): Boolean {
         for (extension in element.project.extensionArea.getExtensionPoint(SimpleNameReferenceExtension.EP_NAME).extensions) {
             if (extension.isReferenceTo(this, element)) return true
         }
-
-        return super<KtDescriptorsBasedReference>.isReferenceTo(element)
-    }
-
-    override fun getRangeInElement(): TextRange {
-        val element = element.getReferencedNameElement()
-        val startOffset = getElement().startOffset
-        return element.textRange.shiftRight(-startOffset)
-    }
-
-    override fun canRename(): Boolean {
-        if (expression.getParentOfTypeAndBranch<KtWhenConditionInRange>(strict = true) { operationReference } != null) return false
-
-        val elementType = expression.getReferencedNameElementType()
-        if (elementType == KtTokens.PLUSPLUS || elementType == KtTokens.MINUSMINUS) return false
-
-        return true
+        return false
     }
 
     override fun handleElementRename(newElementName: String): PsiElement {
@@ -145,11 +133,6 @@ class KtSimpleNameReferenceDescriptorsImpl(
         return expression
     }
 
-
-    // By default reference binding is delayed
-    override fun bindToElement(element: PsiElement): PsiElement =
-        bindToElement(element, ShorteningMode.DELAYED_SHORTENING)
-
     override fun bindToElement(element: PsiElement, shorteningMode: ShorteningMode): PsiElement =
         element.getKotlinFqName()?.let { fqName -> bindToFqName(fqName, shorteningMode, element) } ?: expression
 
@@ -262,31 +245,6 @@ class KtSimpleNameReferenceDescriptorsImpl(
         return selector as KtNameReferenceExpression
     }
 
-    override fun getCanonicalText(): String = expression.text
-
-    override val resolvesByNames: Collection<Name>
-        get() {
-            val element = element
-
-            if (element is KtOperationReferenceExpression) {
-                val tokenType = element.operationSignTokenType
-                if (tokenType != null) {
-                    val name = OperatorConventions.getNameForOperationSymbol(
-                        tokenType, element.parent is KtUnaryExpression, element.parent is KtBinaryExpression
-                    ) ?: return emptyList()
-                    val counterpart = OperatorConventions.ASSIGNMENT_OPERATION_COUNTERPARTS[tokenType]
-                    return if (counterpart != null) {
-                        val counterpartName = OperatorConventions.getNameForOperationSymbol(counterpart, false, true)!!
-                        listOf(name, counterpartName)
-                    } else {
-                        listOf(name)
-                    }
-                }
-            }
-
-            return listOf(element.getReferencedNameAsName())
-        }
-
     override fun getImportAlias(): KtImportAlias? {
         fun DeclarationDescriptor.unwrap() = if (this is ImportedFromObjectCallableDescriptor<*>) callableFromObject else this
 
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
index d0dc9821f699..23347a1ddde1 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/SyntheticPropertyAccessorReference.kt
@@ -30,14 +30,12 @@ class SyntheticPropertyAccessorReferenceDescriptorImpl(
     getter: Boolean
 ) : SyntheticPropertyAccessorReference(expression, getter), KtDescriptorsBasedReference {
 
-    override fun isReferenceTo(element: PsiElement): Boolean {
+    override fun canBeReferenceTo(element: PsiElement): Boolean {
         if (element !is PsiMethod || !isAccessorName(element.name)) return false
         if (!getter && expression.readWriteAccess(true) == ReferenceAccess.READ) return false
-        return additionalIsReferenceToChecker(element)
+        return true
     }
 
-    override fun additionalIsReferenceToChecker(element: PsiElement): Boolean = matchesTarget(element)
-
     override fun getTargetDescriptors(context: BindingContext): Collection<DeclarationDescriptor> {
         val descriptors = expression.getReferenceTargets(context)
         if (descriptors.none { it is SyntheticJavaPropertyDescriptor }) return emptyList()
@@ -174,6 +172,10 @@ class SyntheticPropertyAccessorReferenceDescriptorImpl(
         return renameByPropertyName(newName.identifier)
     }
 
+    override fun isReferenceToImportAlias(alias: KtImportAlias): Boolean {
+        return super<KtDescriptorsBasedReference>.isReferenceToImportAlias(alias)
+    }
+
     override val resolvesByNames: Collection<Name>
         get() = listOf(element.getReferencedNameAsName())
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
index 82858bd9b9b1..fec7ff0c6496 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.builtins.isExtensionFunctionType
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.core.canMoveLambdaOutsideParentheses
 import org.jetbrains.kotlin.idea.core.moveFunctionLiteralOutsideParentheses
 import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
@@ -20,7 +21,6 @@ import org.jetbrains.kotlin.idea.stubindex.KotlinPropertyShortNameIndex
 import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex
 import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
@@ -58,28 +58,6 @@ val KDocName.mainReferenceCompat: KDocReference
 val KtElement.mainReferenceCompat: KtReference?
     get() = mainReference
 
-// Navigation element of the resolved reference
-// For property accessor return enclosing property
-val PsiReference.unwrappedTargets: Set<PsiElement>
-    get() {
-        fun PsiElement.adjust(): PsiElement? = when (val target = unwrapped?.originalElement) {
-            is KtPropertyAccessor -> target.getNonStrictParentOfType<KtProperty>()
-            else -> target
-        }
-
-        return when (this) {
-            is PsiPolyVariantReference -> multiResolve(false).mapNotNullTo(HashSet()) { it.element?.adjust() }
-            else -> listOfNotNull(resolve()?.adjust()).toSet()
-        }
-    }
-
-//
-fun PsiReference.canBeReferenceTo(candidateTarget: PsiElement): Boolean {
-    // optimization
-    return element.containingFile == candidateTarget.containingFile
-            || ProjectRootsUtil.isInProjectOrLibSource(element, includeScriptsOutsideSourceRoots = true)
-}
-
 fun DeclarationDescriptor.findPsiDeclarations(project: Project, resolveScope: GlobalSearchScope): Collection<PsiElement> {
     val fqName = importableFqName ?: return emptyList()
 
@@ -97,133 +75,6 @@ fun DeclarationDescriptor.findPsiDeclarations(project: Project, resolveScope: Gl
     }
 }
 
-fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
-    if (!canBeReferenceTo(candidateTarget)) return false
-
-    val unwrappedCandidate = candidateTarget.unwrapped?.originalElement ?: return false
-
-    // Optimizations
-    when (this) {
-        is KtInvokeFunctionReference -> {
-            if (candidateTarget !is KtNamedFunction && candidateTarget !is PsiMethod) return false
-            if ((candidateTarget as PsiNamedElement).name != OperatorNameConventions.INVOKE.asString()) {
-                return false
-            }
-        }
-        is KtDestructuringDeclarationReference -> {
-            if (candidateTarget !is KtNamedFunction && candidateTarget !is KtParameter && candidateTarget !is PsiMethod) return false
-        }
-        is KtSimpleNameReference -> {
-            if (unwrappedCandidate is PsiMethod && !canBePsiMethodReference()) return false
-        }
-    }
-
-    val element = element
-
-    if (candidateTarget is KtImportAlias &&
-        (element is KtSimpleNameExpression && element.getReferencedName() == candidateTarget.name ||
-                this is KDocReference && this.canonicalText == candidateTarget.name)
-    ) {
-        val importDirective = candidateTarget.importDirective ?: return false
-        val importedFqName = importDirective.importedFqName ?: return false
-        val importedDescriptors = importDirective.containingKtFile.resolveImportReference(importedFqName)
-        val importableTargets = unwrappedTargets.mapNotNull {
-            when {
-                it is KtConstructor<*> -> it.containingClassOrObject
-                it is PsiMethod && it.isConstructor -> it.containingClass
-                else -> it
-            }
-        }
-
-        val project = element.project
-        val resolveScope = element.resolveScope
-        return importedDescriptors.any {
-            it.findPsiDeclarations(project, resolveScope).any { declaration ->
-                declaration in importableTargets
-            }
-        }
-    }
-
-    if (element is KtLabelReferenceExpression) {
-        when ((element.parent as? KtContainerNode)?.parent) {
-            is KtReturnExpression -> unwrappedTargets.forEach {
-                if (it !is KtFunctionLiteral && !(it is KtNamedFunction && it.name.isNullOrEmpty())) return@forEach
-                it as KtFunction
-
-                val labeledExpression = it.getLabeledParent(element.getReferencedName())
-                if (labeledExpression != null) {
-                    if (candidateTarget == labeledExpression) return true else return@forEach
-                }
-                val calleeReference = it.getCalleeByLambdaArgument()?.mainReference ?: return@forEach
-                if (calleeReference.matchesTarget(candidateTarget)) return true
-            }
-            is KtBreakExpression, is KtContinueExpression -> unwrappedTargets.forEach {
-                val labeledExpression = (it as? KtExpression)?.getLabeledParent(element.getReferencedName()) ?: return@forEach
-                if (candidateTarget == labeledExpression) return true
-            }
-        }
-    }
-
-    val targets = unwrappedTargets
-    val manager = candidateTarget.manager
-    if (targets.any { manager.areElementsEquivalent(unwrappedCandidate, it) }) {
-        return true
-    }
-
-    if (this is KtReference) {
-        return targets.any {
-            it.isConstructorOf(unwrappedCandidate)
-                    || it is KtObjectDeclaration && it.isCompanion() && it.getNonStrictParentOfType<KtClass>() == unwrappedCandidate
-        }
-    }
-    // TODO: Workaround for Kotlin constructor search in Java code. To be removed after refactoring of the search API
-    else if (this is PsiJavaCodeReferenceElement && unwrappedCandidate is KtConstructor<*>) {
-        var parent = getElement().parent
-        if (parent is PsiAnonymousClass) {
-            parent = parent.getParent()
-        }
-        if ((parent as? PsiNewExpression)?.resolveConstructor()?.unwrapped == unwrappedCandidate) return true
-    }
-    if (this is PsiJavaCodeReferenceElement && candidateTarget is KtObjectDeclaration && unwrappedTargets.size == 1) {
-        val referredClass = unwrappedTargets.first()
-        if (referredClass is KtClass && candidateTarget in referredClass.companionObjects) {
-            if (parent is PsiImportStaticStatement) return true
-
-            return parent.reference?.unwrappedTargets?.any {
-                (it is KtProperty || it is KtNamedFunction) && it.parent?.parent == candidateTarget
-            } ?: false
-        }
-    }
-    return false
-}
-
-fun KtSimpleNameReference.canBePsiMethodReference(): Boolean {
-    // NOTE: Accessor references are handled separately, see SyntheticPropertyAccessorReference
-    if (element == (element.parent as? KtCallExpression)?.calleeExpression) return true
-
-    val callableReference = element.getParentOfTypeAndBranch<KtCallableReferenceExpression> { callableReference }
-    if (callableReference != null) return true
-
-    val binaryOperator = element.getParentOfTypeAndBranch<KtBinaryExpression> { operationReference }
-    if (binaryOperator != null) return true
-
-    val unaryOperator = element.getParentOfTypeAndBranch<KtUnaryExpression> { operationReference }
-    if (unaryOperator != null) return true
-
-    if (element.getNonStrictParentOfType<KtImportDirective>() != null) return true
-
-    return false
-}
-
-private fun PsiElement.isConstructorOf(unwrappedCandidate: PsiElement) =
-    when {
-        // call to Java constructor
-        this is PsiMethod && isConstructor && containingClass == unwrappedCandidate -> true
-        // call to Kotlin constructor
-        this is KtConstructor<*> && getContainingClassOrObject().isEquivalentTo(unwrappedCandidate) -> true
-        else -> false
-    }
-
 fun AbstractKtReference<out KtExpression>.renameImplicitConventionalCall(newName: String?): KtExpression {
     if (newName == null) return expression
 
@@ -286,12 +137,3 @@ fun KtElement.canBeResolvedViaImport(target: DeclarationDescriptor, bindingConte
     if (parent is KtThisExpression || parent is KtSuperExpression) return false // TODO: it's a bad design of PSI tree, we should change it
     return true
 }
-
-fun KtFunction.getCalleeByLambdaArgument(): KtSimpleNameExpression? {
-    val argument = getParentOfTypeAndBranch<KtValueArgument> { getArgumentExpression() } ?: return null
-    val callExpression = when (argument) {
-        is KtLambdaArgument -> argument.parent as? KtCallExpression
-        else -> (argument.parent as? KtValueArgumentList)?.parent as? KtCallExpression
-    } ?: return null
-    return callExpression.calleeExpression as? KtSimpleNameExpression
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
index b12bca6baa90..ddae92a1545b 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 
 //TODO: workaround for bug in JavaClsStructureViewBuilderProvider, remove when IDEA api is updated
 class KtClsStructureViewBuilderProvider : StructureViewBuilderProvider {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
index 5c759075fade..d456820e7d43 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.stubs.*;
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
 import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService;
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
 import org.jetbrains.kotlin.util.TypeIndexUtilKt;
 
 import java.io.IOException;
@@ -35,26 +36,25 @@ public class IdeStubIndexService extends StubIndexService {
 
         if (stub.isScript()) return;
 
-        FqName facadeFqName = ((KotlinFileStubForIde) stub).getFacadeFqName();
+        FqName facadeFqName = ((KotlinFileStubImpl) stub).getFacadeFqName();
         if (facadeFqName != null) {
             sink.occurrence(KotlinFileFacadeFqNameIndex.INSTANCE.getKey(), facadeFqName.asString());
             sink.occurrence(KotlinFileFacadeShortNameIndex.INSTANCE.getKey(), facadeFqName.shortName().asString());
             sink.occurrence(KotlinFileFacadeClassByPackageIndex.INSTANCE.getKey(), packageFqName.asString());
         }
 
-        FqName partFqName = ((KotlinFileStubForIde) stub).getPartFqName();
+        FqName partFqName = ((KotlinFileStubImpl) stub).getPartFqName();
         if (partFqName != null) {
             sink.occurrence(KotlinFilePartClassIndex.INSTANCE.getKey(), partFqName.asString());
         }
 
-        List<StringRef> partNames = ((KotlinFileStubForIde) stub).getFacadePartSimpleNames();
+        List<String> partNames = ((KotlinFileStubImpl) stub).getFacadePartSimpleNames();
         if (partNames != null) {
-            for (StringRef partName : partNames) {
-                String partSimpleName = StringRef.toString(partName);
-                if (partSimpleName == null) {
+            for (String partName : partNames) {
+                if (partName == null) {
                     continue;
                 }
-                FqName multiFileClassPartFqName = packageFqName.child(Name.identifier(partSimpleName));
+                FqName multiFileClassPartFqName = packageFqName.child(Name.identifier(partName));
                 sink.occurrence(KotlinMultifileClassPartIndex.INSTANCE.getKey(), multiFileClassPartFqName.asString());
             }
         }
@@ -295,35 +295,35 @@ public class IdeStubIndexService extends StubIndexService {
     @NotNull
     @Override
     public KotlinFileStub createFileStub(@NotNull KtFile file) {
-        StringRef packageFqName = StringRef.fromString(file.getPackageFqNameByTree().asString());
+        String packageFqName =file.getPackageFqNameByTree().asString();
         boolean isScript = file.isScriptByTree();
         if (file.hasTopLevelCallables()) {
             JvmFileClassInfo fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(file);
-            StringRef facadeFqNameRef = StringRef.fromString(fileClassInfo.getFacadeClassFqName().asString());
-            StringRef partSimpleName = StringRef.fromString(fileClassInfo.getFileClassFqName().shortName().asString());
-            return new KotlinFileStubForIde(file, packageFqName, isScript, facadeFqNameRef, partSimpleName, null);
+            String facadeFqNameRef = fileClassInfo.getFacadeClassFqName().asString();
+            String partSimpleName = fileClassInfo.getFileClassFqName().shortName().asString();
+            return new KotlinFileStubImpl(file, packageFqName, isScript, facadeFqNameRef, partSimpleName, null);
         }
-        return new KotlinFileStubForIde(file, packageFqName, isScript, null, null, null);
+        return new KotlinFileStubImpl(file, packageFqName, isScript, null, null, null);
     }
 
     @Override
     public void serializeFileStub(
             @NotNull KotlinFileStub stub, @NotNull StubOutputStream dataStream
     ) throws IOException {
-        KotlinFileStubForIde fileStub = (KotlinFileStubForIde) stub;
+        KotlinFileStubImpl fileStub = (KotlinFileStubImpl) stub;
         dataStream.writeName(fileStub.getPackageFqName().asString());
         dataStream.writeBoolean(fileStub.isScript());
         FqName facadeFqName = fileStub.getFacadeFqName();
         dataStream.writeName(facadeFqName != null ? facadeFqName.asString() : null);
-        dataStream.writeName(StringRef.toString(fileStub.getPartSimpleName()));
-        List<StringRef> facadePartNames = fileStub.getFacadePartSimpleNames();
+        dataStream.writeName(fileStub.getPartSimpleName());
+        List<String> facadePartNames = fileStub.getFacadePartSimpleNames();
         if (facadePartNames == null) {
             dataStream.writeInt(0);
         }
         else {
             dataStream.writeInt(facadePartNames.size());
-            for (StringRef partName : facadePartNames) {
-                dataStream.writeName(StringRef.toString(partName));
+            for (String partName : facadePartNames) {
+                dataStream.writeName(partName);
             }
         }
     }
@@ -331,20 +331,20 @@ public class IdeStubIndexService extends StubIndexService {
     @NotNull
     @Override
     public KotlinFileStub deserializeFileStub(@NotNull StubInputStream dataStream) throws IOException {
-        StringRef packageFqNameAsString = dataStream.readName();
+        String packageFqNameAsString = dataStream.readNameString();
         if (packageFqNameAsString == null) {
             throw new IllegalStateException("Can't read package fqname from stream");
         }
 
         boolean isScript = dataStream.readBoolean();
-        StringRef facadeStringRef = dataStream.readName();
-        StringRef partSimpleName = dataStream.readName();
+        String facadeString = dataStream.readNameString();
+        String partSimpleName = dataStream.readNameString();
         int numPartNames = dataStream.readInt();
-        List<StringRef> facadePartNames = new ArrayList<>();
+        List<String> facadePartNames = new ArrayList<>();
         for (int i = 0; i < numPartNames; ++i) {
-            StringRef partNameRef = dataStream.readName();
+            String partNameRef = dataStream.readNameString();
             facadePartNames.add(partNameRef);
         }
-        return new KotlinFileStubForIde(null, packageFqNameAsString, isScript, facadeStringRef, partSimpleName, facadePartNames);
+        return new KotlinFileStubImpl(null, packageFqNameAsString, isScript, facadeString, partSimpleName, facadePartNames);
     }
 }
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
deleted file mode 100644
index 677589a14848..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileStubForIde.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.stubindex
-
-import com.intellij.psi.stubs.PsiClassHolderFileStub
-import com.intellij.util.io.StringRef
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.stubs.KotlinFileStub
-import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
-
-class KotlinFileStubForIde(
-    ktFile: KtFile?,
-    packageName: StringRef,
-    isScript: Boolean,
-    private val facadeFqNameRef: StringRef?,
-    val partSimpleName: StringRef?,
-    val facadePartSimpleNames: List<StringRef?>?
-) : KotlinFileStubImpl(ktFile, packageName, isScript), KotlinFileStub, PsiClassHolderFileStub<KtFile> {
-
-    private fun StringRef.relativeToPackage() = getPackageFqName().child(Name.identifier(this.string))
-
-    val partFqName: FqName?
-        get() = partSimpleName?.relativeToPackage()
-    val facadeFqName: FqName?
-        get() = facadeFqNameRef?.let { FqName(it.string) }
-
-    constructor(ktFile: KtFile?, packageName: String, isScript: Boolean) : this(
-        ktFile,
-        StringRef.fromString(packageName)!!,
-        isScript,
-        null,
-        null,
-        null
-    )
-
-    companion object {
-        fun forFile(packageFqName: FqName, isScript: Boolean): KotlinFileStubImpl = KotlinFileStubForIde(
-            ktFile = null,
-            packageName = StringRef.fromString(packageFqName.asString())!!,
-            facadeFqNameRef = null,
-            partSimpleName = null,
-            facadePartSimpleNames = null,
-            isScript = isScript
-        )
-
-        fun forFileFacadeStub(facadeFqName: FqName): KotlinFileStubImpl = KotlinFileStubForIde(
-            ktFile = null,
-            packageName = facadeFqName.parent().stringRef(),
-            facadeFqNameRef = facadeFqName.stringRef(),
-            partSimpleName = facadeFqName.shortName().stringRef(),
-            facadePartSimpleNames = null,
-            isScript = false
-        )
-
-        fun forMultifileClassStub(packageFqName: FqName, facadeFqName: FqName, partNames: List<String>?): KotlinFileStubImpl = KotlinFileStubForIde(
-            ktFile = null,
-            packageName = packageFqName.stringRef(),
-            facadeFqNameRef = facadeFqName.stringRef(),
-            partSimpleName = null,
-            facadePartSimpleNames = partNames?.map { StringRef.fromString(it) },
-            isScript = false
-        )
-
-        private fun FqName.stringRef() = StringRef.fromString(asString())!!
-        private fun Name.stringRef() = StringRef.fromString(asString())!!
-    }
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt
index 516c6c83f5a5..672ec3a25801 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt
@@ -22,10 +22,10 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFileSystemItem
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinModuleFileType
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
 import org.jetbrains.kotlin.idea.klib.KlibMetaFileType
 import org.jetbrains.kotlin.idea.util.application.runReadAction
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt
deleted file mode 100644
index 8fe1fcdc3c9e..000000000000
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.kotlin.idea.util
-
-import com.intellij.injected.editor.VirtualFileWindow
-import com.intellij.openapi.roots.ProjectRootManager
-import com.intellij.openapi.vfs.NonPhysicalFileSystem
-import com.intellij.psi.PsiElement
-import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes
-import org.jetbrains.jps.model.java.JavaSourceRootProperties
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-import org.jetbrains.kotlin.config.ALL_KOTLIN_SOURCE_ROOT_TYPES
-import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithContent
-import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
-import org.jetbrains.kotlin.idea.caches.resolve.returnIfNoDescriptorForDeclarationException
-import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-
-
-/**
- * Best effort to analyze element:
- * - Best effort for file that is out of source root scope: NoDescriptorForDeclarationException could be swallowed
- * - Do not swallow NoDescriptorForDeclarationException during analysis for in source scope files
- */
-inline fun <T> PsiElement.actionUnderSafeAnalyzeBlock(crossinline action: () -> T, crossinline fallback: () -> T): T = try {
-    action()
-} catch (e: Exception) {
-    e.returnIfNoDescriptorForDeclarationException(condition = {
-        val file = containingFile
-        it && (!file.isPhysical || !file.isUnderKotlinSourceRootTypes())
-    }) { fallback() }
-}
-
-@JvmOverloads
-fun KtElement.safeAnalyzeNonSourceRootCode(
-    bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL
-): BindingContext = safeAnalyzeNonSourceRootCode(getResolutionFacade(), bodyResolveMode)
-
-fun KtElement.safeAnalyzeNonSourceRootCode(
-    resolutionFacade: ResolutionFacade,
-    bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL
-): BindingContext =
-    actionUnderSafeAnalyzeBlock({ analyze(resolutionFacade, bodyResolveMode) }, { BindingContext.EMPTY })
-
-@JvmOverloads
-fun KtDeclaration.safeAnalyzeWithContentNonSourceRootCode(): BindingContext =
-    safeAnalyzeWithContentNonSourceRootCode(getResolutionFacade())
-
-fun KtDeclaration.safeAnalyzeWithContentNonSourceRootCode(
-    resolutionFacade: ResolutionFacade,
-): BindingContext =
-    actionUnderSafeAnalyzeBlock({ analyzeWithContent(resolutionFacade) }, { BindingContext.EMPTY })
-
-val KOTLIN_AWARE_SOURCE_ROOT_TYPES: Set<JpsModuleSourceRootType<JavaSourceRootProperties>> =
-    JavaModuleSourceRootTypes.SOURCES + ALL_KOTLIN_SOURCE_ROOT_TYPES
-
-fun PsiElement?.isUnderKotlinSourceRootTypes(): Boolean {
-    val ktFile = this?.containingFile.safeAs<KtFile>() ?: return false
-    val file = ktFile.virtualFile?.takeIf { it !is VirtualFileWindow && it.fileSystem !is NonPhysicalFileSystem } ?: return false
-    val projectFileIndex = ProjectRootManager.getInstance(ktFile.project).fileIndex
-    return projectFileIndex.isUnderSourceRootOfType(file, KOTLIN_AWARE_SOURCE_ROOT_TYPES)
-}
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
index e4b87624d27a..2205afb28699 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinLibraryKindIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileVisitor
 import com.intellij.openapi.vfs.VirtualFileWithId
-import org.jetbrains.kotlin.idea.caches.FileAttributeService
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
 
 enum class KnownLibraryKindForIndex {
diff --git a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
index f70e2ec81b86..b51ab2255489 100644
--- a/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
+++ b/plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
@@ -9,10 +9,10 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.indexing.*
 import com.intellij.util.io.IOUtil
 import com.intellij.util.io.KeyDescriptor
+import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltInsPackageFragmentProvider
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.idea.decompiler.builtIns.BuiltInDefinitionFile
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
 import org.jetbrains.kotlin.idea.klib.KlibLoadingMetadataCache
 import org.jetbrains.kotlin.idea.klib.KlibMetaFileType
@@ -84,7 +84,7 @@ object KotlinClassFileIndex : KotlinFileIndexBase<KotlinClassFileIndex>(KotlinCl
     private const val VERSION = 3
 
     private val INDEXER = indexer { fileContent ->
-        val headerInfo = IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(fileContent.file, fileContent.content)
+        val headerInfo = ClsKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(fileContent.file, fileContent.content)
         if (headerInfo != null && headerInfo.metadataVersion.isCompatible()) headerInfo.classId.asSingleFqName() else null
     }
 }
diff --git a/plugins/kotlin/common/kotlin.common.iml b/plugins/kotlin/common/kotlin.common.iml
index 1fa31e86d6f7..f84cff5271ef 100644
--- a/plugins/kotlin/common/kotlin.common.iml
+++ b/plugins/kotlin/common/kotlin.common.iml
@@ -19,5 +19,6 @@
     <orderEntry type="module" module-name="intellij.java.ui" />
     <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/extendedResolutionApi.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/extendedResolutionApi.kt
index 5207043b7663..7239d67cc1b0 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/extendedResolutionApi.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/extendedResolutionApi.kt
@@ -7,6 +7,8 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
+import org.jetbrains.kotlin.idea.util.actionUnderSafeAnalyzeBlock
+import org.jetbrains.kotlin.idea.util.returnIfNoDescriptorForDeclarationException
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
@@ -126,3 +128,23 @@ fun KtDeclaration.analyzeWithContent(resolutionFacade: ResolutionFacade): Bindin
 inline fun <reified T> T.analyzeWithContent(resolutionFacade: ResolutionFacade): BindingContext where T : KtDeclarationContainer, T : KtElement =
     resolutionFacade.analyzeWithAllCompilerChecks(this).bindingContext
 
+
+@JvmOverloads
+fun KtElement.safeAnalyzeNonSourceRootCode(
+    bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL
+): BindingContext = safeAnalyzeNonSourceRootCode(getResolutionFacade(), bodyResolveMode)
+
+fun KtElement.safeAnalyzeNonSourceRootCode(
+    resolutionFacade: ResolutionFacade,
+    bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL
+): BindingContext =
+    actionUnderSafeAnalyzeBlock({ analyze(resolutionFacade, bodyResolveMode) }, { BindingContext.EMPTY })
+
+@JvmOverloads
+fun KtDeclaration.safeAnalyzeWithContentNonSourceRootCode(): BindingContext =
+    safeAnalyzeWithContentNonSourceRootCode(getResolutionFacade())
+
+fun KtDeclaration.safeAnalyzeWithContentNonSourceRootCode(
+    resolutionFacade: ResolutionFacade,
+): BindingContext =
+    actionUnderSafeAnalyzeBlock({ analyzeWithContent(resolutionFacade) }, { BindingContext.EMPTY })
\ No newline at end of file
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
index 9a6705998a3a..9c5baba72db0 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
@@ -226,16 +226,3 @@ fun ResolutionFacade.resolveImportReference(
     DeprecationLevel.ERROR
 )
 fun KtElement.analyzeFully(): BindingContext = analyzeWithAllCompilerChecks().bindingContext
-
-val Exception.isItNoDescriptorForDeclarationException: Boolean
-    get() = this is NoDescriptorForDeclarationException || cause?.safeAs<Exception>()?.isItNoDescriptorForDeclarationException == true
-
-inline fun <T> Exception.returnIfNoDescriptorForDeclarationException(
-    crossinline condition: (Boolean) -> Boolean = { v -> v },
-    crossinline computable: () -> T
-): T =
-    if (condition(this.isItNoDescriptorForDeclarationException)) {
-        computable()
-    } else {
-        throw this
-    }
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
index c199f3488edd..0c5d8d0d734f 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.CallHandle
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemBuilderImpl
 import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.checker.StrictEqualityTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.*
 import java.util.*
@@ -166,7 +167,7 @@ class FuzzyType(
                 valueTransform = {
                     val typeProjection = TypeProjectionImpl(Variance.INVARIANT, it.defaultType)
                     val substitutedProjection = substitutorToKeepCapturedTypes.substitute(typeProjection)
-                    substitutedProjection?.takeUnless { ErrorUtils.containsUninferredParameter(it.type) } ?: typeProjection
+                    substitutedProjection?.takeUnless { ErrorUtils.containsUninferredTypeVariable(it.type) } ?: typeProjection
                 })
         return TypeConstructorSubstitution.createByConstructorsMap(substitutionMap, approximateCapturedTypes = true).buildSubstitutor()
     }
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
index 05cb9e0a8430..0ac6b9010fdd 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/ShadowedDeclarationsFilter.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.util
 
@@ -20,13 +20,13 @@ import org.jetbrains.kotlin.resolve.calls.CallResolver
 import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext
 import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode
 import org.jetbrains.kotlin.resolve.calls.context.ContextDependency
+import org.jetbrains.kotlin.resolve.multiplatform.findExpects
 import org.jetbrains.kotlin.resolve.scopes.ExplicitImportsScope
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.scopes.utils.addImportingScope
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.util.descriptorsEqualWithSubstitution
-import java.util.*
 
 class ShadowedDeclarationsFilter(
     private val bindingContext: BindingContext,
@@ -66,14 +66,26 @@ class ShadowedDeclarationsFilter(
         declarations.groupBy { signature(it) }.values.flatMap { group -> filterEqualSignatureGroup(group) }
 
     fun <TDescriptor : DeclarationDescriptor> createNonImportedDeclarationsFilter(
-        importedDeclarations: Collection<DeclarationDescriptor>
+        importedDeclarations: Collection<DeclarationDescriptor>,
+        allowExpectedDeclarations: Boolean,
     ): (Collection<TDescriptor>) -> Collection<TDescriptor> {
-        val importedDeclarationsSet = importedDeclarations.toSet()
+        val importedDeclarationsSet = if (allowExpectedDeclarations) {
+            importedDeclarations.asSequence().flatMap {
+                if (it is MemberDescriptor && it.isActual) {
+                    sequenceOf(it) + it.findExpects().asSequence()
+                } else {
+                    sequenceOf(it)
+                }
+            }.toSet()
+        } else {
+            importedDeclarations.toSet()
+        }
+
         val importedDeclarationsBySignature = importedDeclarationsSet.groupBy { signature(it) }
 
         return filter@{ declarations ->
             // optimization
-            if (declarations.size == 1 && importedDeclarationsBySignature[signature(declarations.single())] == null) return@filter declarations
+            if (declarations.isEmpty() || declarations.size == 1 && importedDeclarationsBySignature[signature(declarations.single())] == null) return@filter declarations
 
             val nonImportedDeclarations = declarations.filter { it !in importedDeclarationsSet }
 
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
index 8d59254be78f..010612ef5aa0 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
@@ -39,6 +39,9 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorType
+import org.jetbrains.kotlin.types.error.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorScopeKind
 import org.jetbrains.kotlin.types.typeUtil.*
 import org.jetbrains.kotlin.utils.SmartSet
 
@@ -127,11 +130,11 @@ private fun KotlinType.approximateNonDynamicFlexibleTypes(
         return AbbreviatedType(it.expandedType, it.abbreviation.approximateNonDynamicFlexibleTypes(preferNotNull))
     }
     return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-        annotations,
+        annotations.toDefaultAttributes(),
         constructor,
         arguments.map { it.substitute { type -> type.approximateFlexibleTypes(preferNotNull = true) } },
         isMarkedNullable,
-        ErrorUtils.createErrorScope("This type is not supposed to be used in member resolution", true)
+        ErrorUtils.createErrorScope(ErrorScopeKind.UNSUPPORTED_TYPE_SCOPE, true, constructor.toString())
     )
 }
 
diff --git a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index f6488504c9b6..0a875928f6c1 100644
--- a/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/plugins/kotlin/common/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver
 import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.expressions.DoubleColonLHS
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
diff --git a/plugins/kotlin/compiler-plugins/allopen/tests/kotlin.compiler-plugins.allopen.tests.iml b/plugins/kotlin/compiler-plugins/allopen/tests/kotlin.compiler-plugins.allopen.tests.iml
index ad2e99b59218..d5415d823f8a 100644
--- a/plugins/kotlin/compiler-plugins/allopen/tests/kotlin.compiler-plugins.allopen.tests.iml
+++ b/plugins/kotlin/compiler-plugins/allopen/tests/kotlin.compiler-plugins.allopen.tests.iml
@@ -12,12 +12,12 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.allopen-compiler-plugin" level="project" />
     <orderEntry type="library" name="JUnit4" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.allopen.common" />
     <orderEntry type="module" module-name="kotlin.test-framework" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="RUNTIME" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.psi" />
diff --git a/plugins/kotlin/compiler-plugins/compiler-plugin-support/common/kotlin.compiler-plugins.compiler-plugin-support.common.iml b/plugins/kotlin/compiler-plugins/compiler-plugin-support/common/kotlin.compiler-plugins.compiler-plugin-support.common.iml
index 642348f077f6..99f07990fda7 100644
--- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/common/kotlin.compiler-plugins.compiler-plugin-support.common.iml
+++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/common/kotlin.compiler-plugins.compiler-plugin-support.common.iml
@@ -10,8 +10,8 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
   </component>
diff --git a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
index 5c9c91833f21..7e983838b9be 100644
--- a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
+++ b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
@@ -11,8 +11,8 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-java" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling" />
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/common/kotlin.compiler-plugins.kotlinx-serialization.common.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/common/kotlin.compiler-plugins.kotlinx-serialization.common.iml
index 92ecaf497ad2..2ca864cc91ba 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/common/kotlin.compiler-plugins.kotlinx-serialization.common.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/common/kotlin.compiler-plugins.kotlinx-serialization.common.iml
@@ -16,8 +16,8 @@
     <orderEntry type="library" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-cli" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml
index 363975906e1c..e746f422eb5e 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/tests/kotlin.compiler-plugins.kotlinx-serialization.tests.iml
@@ -10,10 +10,10 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.kotlinx-serialization.common" />
   </component>
diff --git a/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml b/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml
index c1e05289c3d3..1f02dc8f2a18 100644
--- a/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml
+++ b/plugins/kotlin/compiler-plugins/noarg/tests/kotlin.compiler-plugins.noarg.tests.iml
@@ -11,12 +11,12 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.noarg-compiler-plugin" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.noarg.common" />
     <orderEntry type="module" module-name="kotlin.test-framework" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="RUNTIME" />
diff --git a/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml b/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
index 933e6bba9e88..6ad25e85af26 100644
--- a/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
+++ b/plugins/kotlin/compiler-plugins/scripting/kotlin.compiler-plugins.scripting.iml
@@ -12,8 +12,8 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-java" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.gradle.common" />
diff --git a/plugins/kotlin/completion/resources/messages/KotlinIdeaCompletionBundle.properties b/plugins/kotlin/completion/resources/messages/KotlinIdeaCompletionBundle.properties
index 9ca17cf603a8..e6b67156eaf3 100644
--- a/plugins/kotlin/completion/resources/messages/KotlinIdeaCompletionBundle.properties
+++ b/plugins/kotlin/completion/resources/messages/KotlinIdeaCompletionBundle.properties
@@ -10,7 +10,5 @@ inspection.message.never.used={0} is never used
 formatting.settings.dialog.message.formatterkind=Formatter Kind = {0}
 find.usage.provider.0.of.1={0} of {1}
 find.usage.provider.0={0}
-intention.name.specify.supertype=Specify supertype
-popup.title.choose.supertype=Choose Supertype
 slice.nullness.progress.title.expanding.all.nodes.may.very.well.take.whole.day=Expanding All Nodes... (may very well take the whole day)
 slice.nullness.tab.title.grouped.by.nullness=\ Grouped by Nullness
\ No newline at end of file
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
index 27f6d4592402..723b44bf5c9b 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.completion
 
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.completion.smart.SMART_COMPLETION_ITEM_PRIORITY
 import org.jetbrains.kotlin.idea.completion.smart.SmartCompletion
 import org.jetbrains.kotlin.idea.completion.smart.SmartCompletionItemPriority
 import org.jetbrains.kotlin.idea.core.ExpectedInfo
+import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
 import org.jetbrains.kotlin.idea.core.NotPropertiesService
 import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
 import org.jetbrains.kotlin.idea.imports.importableFqName
@@ -411,28 +412,37 @@ class BasicCompletionSession(
                     else
                         prefixMatcher
 
-                    addClassesFromIndex(classKindFilter, prefixMatcher)
+                    addClassesFromIndex(
+                        kindFilter = classKindFilter,
+                        prefixMatcher = prefixMatcher,
+                        completionParameters = parameters,
+                        indicesHelper = indicesHelper(true),
+                        classifierDescriptorCollector = {
+                            collector.addElement(basicLookupElementFactory.createLookupElement(it), notImported = true)
+                        },
+                        javaClassCollector = {
+                            collector.addElement(basicLookupElementFactory.createLookupElementForJavaClass(it), notImported = true)
+                        }
+                    )
                 }
             } else if (callTypeAndReceiver is CallTypeAndReceiver.DOT) {
                 val qualifier = bindingContext[BindingContext.QUALIFIER, callTypeAndReceiver.receiver]
                 if (qualifier != null) return
                 val receiver = callTypeAndReceiver.receiver as? KtSimpleNameExpression ?: return
-                val helper = indicesHelper(false)
                 val descriptors = mutableListOf<ClassifierDescriptorWithTypeParameters>()
                 val fullTextPrefixMatcher = object : PrefixMatcher(receiver.getReferencedName()) {
                     override fun prefixMatches(name: String): Boolean = name == prefix
                     override fun cloneWithPrefix(prefix: String): PrefixMatcher = throw UnsupportedOperationException("Not implemented")
                 }
 
-                AllClassesCompletion(
-                    parameters = parameters.withPosition(receiver, receiver.startOffset),
-                    kotlinIndicesHelper = helper,
-                    prefixMatcher = fullTextPrefixMatcher,
-                    resolutionFacade = resolutionFacade,
+                addClassesFromIndex(
                     kindFilter = { true },
-                    includeTypeAliases = true,
-                    includeJavaClassesNotToBeUsed = configuration.javaClassesNotToBeUsed,
-                ).collect({ descriptors += it }, { descriptors.addIfNotNull(it.resolveToDescriptor(resolutionFacade)) })
+                    prefixMatcher = fullTextPrefixMatcher,
+                    completionParameters = parameters.withPosition(receiver, receiver.startOffset),
+                    indicesHelper = indicesHelper(false),
+                    classifierDescriptorCollector = { descriptors += it },
+                    javaClassCollector = { descriptors.addIfNotNull(it.resolveToDescriptor(resolutionFacade)) },
+                )
 
                 val foundDescriptors = mutableSetOf<DeclarationDescriptor>()
                 val classifiers = descriptors.asSequence().filter {
@@ -460,9 +470,16 @@ class BasicCompletionSession(
                     )
 
                     val rvCollector = ReferenceVariantsCollector(
-                        rvHelper, indicesHelper(true), prefixMatcher,
-                        nameExpression, callTypeAndReceiver, resolutionFacade, newContext,
-                        importableFqNameClassifier, configuration
+                        referenceVariantsHelper = rvHelper,
+                        indicesHelper = indicesHelper(true),
+                        prefixMatcher = prefixMatcher,
+                        nameExpression = nameExpression,
+                        callTypeAndReceiver = callTypeAndReceiver,
+                        resolutionFacade = resolutionFacade,
+                        bindingContext = newContext,
+                        importableFqNameClassifier = importableFqNameClassifier,
+                        configuration = configuration,
+                        allowExpectedDeclarations = allowExpectedDeclarations,
                     )
 
                     val receiverTypes = detectReceiverTypes(newContext, nameExpression, callTypeAndReceiver)
@@ -777,24 +794,23 @@ class BasicCompletionSession(
         }
     }
 
-    private fun addClassesFromIndex(kindFilter: (ClassKind) -> Boolean, prefixMatcher: PrefixMatcher) {
-        val classifierDescriptorCollector = { descriptor: ClassifierDescriptorWithTypeParameters ->
-            collector.addElement(basicLookupElementFactory.createLookupElement(descriptor), notImported = true)
-        }
-
-        val javaClassCollector = { javaClass: PsiClass ->
-            collector.addElement(basicLookupElementFactory.createLookupElementForJavaClass(javaClass), notImported = true)
-        }
-
+    private fun addClassesFromIndex(
+        kindFilter: (ClassKind) -> Boolean,
+        prefixMatcher: PrefixMatcher,
+        completionParameters: CompletionParameters,
+        indicesHelper: KotlinIndicesHelper,
+        classifierDescriptorCollector: (ClassifierDescriptorWithTypeParameters) -> Unit,
+        javaClassCollector: (PsiClass) -> Unit,
+    ) {
         AllClassesCompletion(
-            parameters = parameters,
-            kotlinIndicesHelper = indicesHelper(true),
+            parameters = completionParameters,
+            kotlinIndicesHelper = indicesHelper,
             prefixMatcher = prefixMatcher,
             resolutionFacade = resolutionFacade,
             kindFilter = kindFilter,
             includeTypeAliases = true,
             includeJavaClassesNotToBeUsed = configuration.javaClassesNotToBeUsed,
-        ).collect(classifierDescriptorCollector, javaClassCollector)
+        ).collect({ processWithShadowedFilter(it, classifierDescriptorCollector) }, javaClassCollector)
     }
 
     private fun addReferenceVariantElements(lookupElementFactory: LookupElementFactory, descriptorKindFilter: DescriptorKindFilter) {
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
index 29b63f6ca695..6ff9dc4befc2 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.completion
 
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.kotlin.idea.core.*
 import org.jetbrains.kotlin.idea.core.util.CodeFragmentUtils
 import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.*
 import org.jetbrains.kotlin.platform.isMultiPlatform
@@ -79,7 +78,8 @@ abstract class CompletionSession(
     protected val resolutionFacade = file.getResolutionFacade()
     protected val moduleDescriptor = resolutionFacade.moduleDescriptor
     protected val project = position.project
-    protected val isJvmModule = TargetPlatformDetector.getPlatform(originalParameters.originalFile as KtFile).isJvm()
+    protected val isJvmModule = moduleDescriptor.platform.isJvm()
+    protected val allowExpectedDeclarations = moduleDescriptor.platform.isMultiPlatform()
     protected val isDebuggerContext = file is KtCodeFragment
 
     protected val nameExpression: KtSimpleNameExpression?
@@ -112,7 +112,7 @@ abstract class CompletionSession(
         originalParameters.offset,
         kotlinIdentifierPartPattern or singleCharPattern('@'),
         kotlinIdentifierStartPattern
-    )!!
+    )
 
     protected val prefixMatcher = CamelHumpMatcher(prefix)
 
@@ -131,6 +131,29 @@ abstract class CompletionSession(
         NotPropertiesService.getNotProperties(position)
     )
 
+    protected val shadowedFilter: ((Collection<DeclarationDescriptor>) -> Collection<DeclarationDescriptor>)? by lazy {
+        ShadowedDeclarationsFilter.create(
+            bindingContext = bindingContext,
+            resolutionFacade = resolutionFacade,
+            context = nameExpression!!,
+            callTypeAndReceiver = callTypeAndReceiver,
+        )?.createNonImportedDeclarationsFilter(
+            importedDeclarations = referenceVariantsCollector!!.allCollected.imported,
+            allowExpectedDeclarations = allowExpectedDeclarations,
+        )
+    }
+
+    protected inline fun <reified T : DeclarationDescriptor> processWithShadowedFilter(descriptor: T, processor: (T) -> Unit) {
+        val shadowedFilter = shadowedFilter
+        val element = if (shadowedFilter != null) {
+            shadowedFilter(listOf(descriptor)).singleOrNull()?.let { it as T }
+        } else {
+            descriptor
+        }
+
+        element?.let(processor)
+    }
+
     protected val callTypeAndReceiver =
         if (nameExpression == null) CallTypeAndReceiver.UNKNOWN else CallTypeAndReceiver.detect(nameExpression)
     protected val receiverTypes = nameExpression?.let { detectReceiverTypes(bindingContext, nameExpression, callTypeAndReceiver) }
@@ -145,7 +168,7 @@ abstract class CompletionSession(
             { CompletionBenchmarkSink.instance.onFlush(this) },
             prefixMatcher, originalParameters, resultSet,
             createSorter(), (file as? KtCodeFragment)?.extraCompletionFilter,
-            moduleDescriptor.platform.isMultiPlatform()
+            allowExpectedDeclarations,
         )
     }
 
@@ -314,9 +337,16 @@ abstract class CompletionSession(
 
     protected val referenceVariantsCollector = if (nameExpression != null) {
         ReferenceVariantsCollector(
-            referenceVariantsHelper, indicesHelper(true), prefixMatcher,
-            nameExpression, callTypeAndReceiver, resolutionFacade, bindingContext,
-            importableFqNameClassifier, configuration
+            referenceVariantsHelper = referenceVariantsHelper,
+            indicesHelper = indicesHelper(true),
+            prefixMatcher = prefixMatcher,
+            nameExpression = nameExpression,
+            callTypeAndReceiver = callTypeAndReceiver,
+            resolutionFacade = resolutionFacade,
+            bindingContext = bindingContext,
+            importableFqNameClassifier = importableFqNameClassifier,
+            configuration = configuration,
+            allowExpectedDeclarations = allowExpectedDeclarations,
         )
     } else {
         null
@@ -347,10 +377,19 @@ abstract class CompletionSession(
 
         val expressionReceiver = ExpressionReceiver.create(explicitReceiver, runtimeType, bindingContext)
         val (variants, notImportedExtensions) = ReferenceVariantsCollector(
-            referenceVariantsHelper, indicesHelper(true), prefixMatcher,
-            nameExpression!!, callTypeAndReceiver, resolutionFacade, bindingContext,
-            importableFqNameClassifier, configuration, runtimeReceiver = expressionReceiver
+            referenceVariantsHelper = referenceVariantsHelper,
+            indicesHelper = indicesHelper(true),
+            prefixMatcher = prefixMatcher,
+            nameExpression = nameExpression!!,
+            callTypeAndReceiver = callTypeAndReceiver,
+            resolutionFacade = resolutionFacade,
+            bindingContext = bindingContext,
+            importableFqNameClassifier = importableFqNameClassifier,
+            configuration = configuration,
+            allowExpectedDeclarations = allowExpectedDeclarations,
+            runtimeReceiver = expressionReceiver,
         ).collectReferenceVariants(descriptorKindFilter!!)
+
         val filteredVariants = filterVariantsForRuntimeReceiverType(variants, referenceVariants.imported)
         val filteredNotImportedExtensions =
             filterVariantsForRuntimeReceiverType(notImportedExtensions, referenceVariants.notImportedExtensions)
@@ -381,15 +420,9 @@ abstract class CompletionSession(
         return callTypeAndReceiver.receiver == null
     }
 
-    protected fun processTopLevelCallables(processor: (CallableDescriptor) -> Unit) {
-        val shadowedFilter = ShadowedDeclarationsFilter.create(bindingContext, resolutionFacade, nameExpression!!, callTypeAndReceiver)
-            ?.createNonImportedDeclarationsFilter<CallableDescriptor>(referenceVariantsCollector!!.allCollected.imported)
+    protected fun processTopLevelCallables(processor: (DeclarationDescriptor) -> Unit) {
         indicesHelper(true).processTopLevelCallables({ prefixMatcher.prefixMatches(it) }) {
-            if (shadowedFilter != null) {
-                shadowedFilter(listOf(it)).singleOrNull()?.let(processor)
-            } else {
-                processor(it)
-            }
+            processWithShadowedFilter(it, processor)
         }
     }
 
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
index 3b2304964091..f4ed30a76ed4 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KeywordValues.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNextSiblingIgnoringWhitespaceAndComme
 import org.jetbrains.kotlin.psi.psiUtil.getPrevSiblingIgnoringWhitespaceAndComments
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.KotlinTypeFactory
+import org.jetbrains.kotlin.types.TypeAttributes
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.typeUtil.isBooleanOrNullableBoolean
@@ -114,7 +115,7 @@ object KeywordValues {
                 @OptIn(FrontendInternals::class)
                 val kClassDescriptor = resolutionFacade.getFrontendService(ReflectionTypes::class.java).kClass
                 val classLiteralType =
-                    KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, kClassDescriptor, listOf(TypeProjectionImpl(qualifierType)))
+                    KotlinTypeFactory.simpleNotNullType(TypeAttributes.Empty, kClassDescriptor, listOf(TypeProjectionImpl(qualifierType)))
                 val kClassTypes = listOf(classLiteralType.toFuzzyType(emptyList()))
                 val kClassMatcher = { info: ExpectedInfo -> kClassTypes.matchExpectedInfo(info) }
                 consumer.consume("class", kClassMatcher, priority =  SmartCompletionItemPriority.CLASS_LITERAL) {
@@ -127,7 +128,7 @@ object KeywordValues {
 
                     if (javaLangClassDescriptor != null) {
                         val javaLangClassType = KotlinTypeFactory.simpleNotNullType(
-                            Annotations.EMPTY,
+                            TypeAttributes.Empty,
                             javaLangClassDescriptor,
                             listOf(TypeProjectionImpl(qualifierType))
                         )
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KotlinInsertTypeArgument.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KotlinInsertTypeArgument.kt
index 2cea008f8440..3bd7cc49c9b0 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KotlinInsertTypeArgument.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/KotlinInsertTypeArgument.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorType
+import org.jetbrains.kotlin.types.error.ErrorType
 
 // Debugging tip: use 'PsiTreeUtilsKt.printTree' to see PSI trees in the runtime. See fun documentation for details.
 
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
index b40c1781ba72..798e5552a4b6 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/ReferenceVariantsCollector.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.completion
 
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.decapitalizeSmartForCompiler
-import java.util.*
 
 data class ReferenceVariants(val imported: Collection<DeclarationDescriptor>, val notImportedExtensions: Collection<CallableDescriptor>)
 
@@ -37,7 +36,8 @@ class ReferenceVariantsCollector(
     private val bindingContext: BindingContext,
     private val importableFqNameClassifier: ImportableFqNameClassifier,
     private val configuration: CompletionSessionConfiguration,
-    private val runtimeReceiver: ExpressionReceiver? = null
+    private val allowExpectedDeclarations: Boolean,
+    private val runtimeReceiver: ExpressionReceiver? = null,
 ) {
 
     private data class FilterConfiguration internal constructor(
@@ -189,8 +189,10 @@ class ReferenceVariantsCollector(
                 )
             }
 
-            val notImportedDeclarationsFilter =
-                shadowedDeclarationsFilter?.createNonImportedDeclarationsFilter<CallableDescriptor>(importedDeclarations = basicVariants.imported + extensionsVariants)
+            val notImportedDeclarationsFilter = shadowedDeclarationsFilter?.createNonImportedDeclarationsFilter<CallableDescriptor>(
+                importedDeclarations = basicVariants.imported + extensionsVariants,
+                allowExpectedDeclarations = allowExpectedDeclarations,
+            )
 
             val filteredImported = filterConfiguration.filterVariants(extensionsVariants + basicVariants.imported)
 
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
index 95e548d299fe..473cf3ee6fdc 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
@@ -10,14 +10,12 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.SmartList
-import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.completion.*
 import org.jetbrains.kotlin.idea.completion.handlers.WithTailInsertHandler
 import org.jetbrains.kotlin.idea.core.*
-import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
 import org.jetbrains.kotlin.idea.util.isAlmostEverything
@@ -34,7 +32,6 @@ import org.jetbrains.kotlin.types.isError
 import org.jetbrains.kotlin.types.typeUtil.isBooleanOrNullableBoolean
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 import org.jetbrains.kotlin.utils.addIfNotNull
-import java.util.*
 
 interface InheritanceItemsSearcher {
     fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit)
@@ -476,9 +473,7 @@ class SmartCompletion(
     }
 
     private fun MutableCollection<LookupElement>.addArrayLiteralsInAnnotationsCompletions() {
-        if (expression.languageVersionSettings.supportsFeature(LanguageFeature.ArrayLiteralsInAnnotations)) {
-            this.addAll(ArrayLiteralsInAnnotationItems.collect(expectedInfos, expression))
-        }
+        this.addAll(ArrayLiteralsInAnnotationItems.collect(expectedInfos, expression))
     }
 
     companion object {
diff --git a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
index 5cfc9b6666f3..ed594543030b 100644
--- a/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
+++ b/plugins/kotlin/completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
@@ -345,7 +345,7 @@ class TypeInstantiationItems(
     ) : InheritanceItemsSearcher {
 
         private val baseHasTypeArgs = classDescriptor.declaredTypeParameters.isNotEmpty()
-        private val expectedType = KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, classDescriptor, typeArgs)
+        private val expectedType = KotlinTypeFactory.simpleNotNullType(TypeAttributes.Empty, classDescriptor, typeArgs)
         private val expectedFuzzyType = expectedType.toFuzzyType(freeParameters)
 
         override fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit) {
diff --git a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java
index aad1761e8935..7364ed11b166 100644
--- a/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java
+++ b/plugins/kotlin/completion/tests/test/org/jetbrains/kotlin/idea/completion/test/MultiFileJvmBasicCompletionTestGenerated.java
@@ -343,6 +343,16 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ
         runTest("testData/basic/multifile/PropertyKeysWithPrefix/");
     }
 
+    @TestMetadata("StaticMembersOfImportedClassFromJava")
+    public void testStaticMembersOfImportedClassFromJava() throws Exception {
+        runTest("testData/basic/multifile/StaticMembersOfImportedClassFromJava/");
+    }
+
+    @TestMetadata("StaticMembersOfImportedInterfaceFromJava")
+    public void testStaticMembersOfImportedInterfaceFromJava() throws Exception {
+        runTest("testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/");
+    }
+
     @TestMetadata("StaticMembersOfNotImportedClassFromJava")
     public void testStaticMembersOfNotImportedClassFromJava() throws Exception {
         runTest("testData/basic/multifile/StaticMembersOfNotImportedClassFromJava/");
diff --git a/plugins/kotlin/completion/tests/testData/basic/common/KT31762.kt b/plugins/kotlin/completion/tests/testData/basic/common/KT31762.kt
index bfa60ad5eeab..ecd6313e120a 100644
--- a/plugins/kotlin/completion/tests/testData/basic/common/KT31762.kt
+++ b/plugins/kotlin/completion/tests/testData/basic/common/KT31762.kt
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 enum class A { AAA }
 enum class E(val one: A, val two: A) {
     EE(A.<caret>, A.AAA)
diff --git a/plugins/kotlin/completion/tests/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt b/plugins/kotlin/completion/tests/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt
index 6b4fad022203..fa0955b0cfa7 100644
--- a/plugins/kotlin/completion/tests/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt
+++ b/plugins/kotlin/completion/tests/testData/basic/common/boldOrGrayed/SafeCallAfterNullable.kt
@@ -1,3 +1,6 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
+
 fun String?.forNullableString(){}
 fun Any?.forNullableAny(){}
 fun String.forString(){}
diff --git a/plugins/kotlin/completion/tests/testData/basic/common/extensionFunctionTypeValues/SafeCall.kt b/plugins/kotlin/completion/tests/testData/basic/common/extensionFunctionTypeValues/SafeCall.kt
index 9be4181a8823..24e7a8798f9d 100644
--- a/plugins/kotlin/completion/tests/testData/basic/common/extensionFunctionTypeValues/SafeCall.kt
+++ b/plugins/kotlin/completion/tests/testData/basic/common/extensionFunctionTypeValues/SafeCall.kt
@@ -1,3 +1,6 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
+
 fun test(i: Int?, foo: Int.(String) -> Char) {
     i?.fo<caret>
 }
diff --git a/plugins/kotlin/completion/tests/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt b/plugins/kotlin/completion/tests/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt
index 703991d74d7f..438214c1fcb7 100644
--- a/plugins/kotlin/completion/tests/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt
+++ b/plugins/kotlin/completion/tests/testData/basic/common/shadowing/PreferCloserReceiverGeneric.kt
@@ -1,5 +1,3 @@
-// FIR_IDENTICAL
-// FIR_COMPARISON
 interface I<T> {
     fun xxx(): T
 }
diff --git a/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/StaticMembersOfImportedClassFromJava.kt b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/StaticMembersOfImportedClassFromJava.kt
new file mode 100644
index 000000000000..c109f88d8343
--- /dev/null
+++ b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/StaticMembersOfImportedClassFromJava.kt
@@ -0,0 +1,15 @@
+// FIR_COMPARISON
+package bar
+
+import javapackage.SomeClass
+
+fun buz {
+    SomeClass.<caret>
+}
+
+// ABSENT: aProc
+// EXIST: CONST_A
+// EXIST: aStaticProc
+// EXIST: getA
+// EXIST: FooBar
+// NOTHING_ELSE
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/javapackage/SomeClass.java b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/javapackage/SomeClass.java
new file mode 100644
index 000000000000..2a0962833e9e
--- /dev/null
+++ b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/javapackage/SomeClass.java
@@ -0,0 +1,15 @@
+package javapackage;
+
+public class SomeClass {
+    public void aProc() {}
+
+    public static void aStaticProc() {}
+
+    public static String getA() {
+        return CONST_A;
+    }
+
+    public static final String CONST_A = "A";
+
+    public static class FooBar {}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/StaticMembersOfImportedInterfaceFromJava.kt b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/StaticMembersOfImportedInterfaceFromJava.kt
new file mode 100644
index 000000000000..3cec27a2def2
--- /dev/null
+++ b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/StaticMembersOfImportedInterfaceFromJava.kt
@@ -0,0 +1,15 @@
+// FIR_COMPARISON
+package bar
+
+import javapackage.SomeInterface
+
+fun buz {
+    SomeInterface.<caret>
+}
+
+// ABSENT: aProc
+// EXIST: CONST_A
+// EXIST: aStaticProc
+// EXIST: getA
+// EXIST: FooBar
+// NOTHING_ELSE
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/javapackage/SomeInterface.java b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/javapackage/SomeInterface.java
new file mode 100644
index 000000000000..bd9e8811f7d6
--- /dev/null
+++ b/plugins/kotlin/completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/javapackage/SomeInterface.java
@@ -0,0 +1,14 @@
+package javapackage;
+
+public interface SomeInterface {
+    public void aProc() {}
+    public static void aStaticProc() {}
+
+    public static String getA() {
+        return CONST_A;
+    }
+
+    public final String CONST_A = "A";
+
+    public static class FooBar {}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests/testData/basic/multifile/SyntheticExtensionForGenericClass/SyntheticExtensionForGenericClass.kt b/plugins/kotlin/completion/tests/testData/basic/multifile/SyntheticExtensionForGenericClass/SyntheticExtensionForGenericClass.kt
index d428453c4203..8c41c46f46e6 100644
--- a/plugins/kotlin/completion/tests/testData/basic/multifile/SyntheticExtensionForGenericClass/SyntheticExtensionForGenericClass.kt
+++ b/plugins/kotlin/completion/tests/testData/basic/multifile/SyntheticExtensionForGenericClass/SyntheticExtensionForGenericClass.kt
@@ -1,4 +1,3 @@
-// FIR_COMPARISON
 fun foo(javaClass: JavaClass<String, Int>) {
     javaClass.<caret>
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt
deleted file mode 100644
index 942c38e00d7b..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is String) {
-        p.first.len<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt.after
deleted file mode 100644
index d21f8b9c1cd4..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.fir.kt.after
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is String) {
-        (p.first as String).length<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt
index 942c38e00d7b..43b72a6e0620 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is String) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt.after
index e559c37c88a0..bfc9479660e6 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast.kt.after
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is String) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt
deleted file mode 100644
index 90ffdb7fa231..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is String && p.first is Int) {
-        p.first.len<caret>
-    }
-}
-
-// ELEMENT: length
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt.after
deleted file mode 100644
index c828ebd9f052..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.fir.kt.after
+++ /dev/null
@@ -1,8 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is String && p.first is Int) {
-        (p.first as CharSequence).length<caret>
-    }
-}
-
-// ELEMENT: length
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt
index 90ffdb7fa231..f2d0fe2c34dd 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is String && p.first is Int) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt.after
index b3422c33571e..683d271abec9 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_notDenotable.kt.after
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is String && p.first is Int) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt
deleted file mode 100644
index c37f09147b01..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// FIR_COMPARISON
-typealias MyList<T> = List<T>
-
-fun test(p: Pair<Any, Any>) {
-    if (p.first is MyList<*>) {
-        p.first.siz<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt.after
deleted file mode 100644
index 7c9793d80707..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.fir.kt.after
+++ /dev/null
@@ -1,11 +0,0 @@
-// FIR_COMPARISON
-typealias MyList<T> = List<T>
-
-fun test(p: Pair<Any, Any>) {
-    if (p.first is MyList<*>) {
-        (p.first as MyList<*>).size<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt
index c37f09147b01..8eeda3ea2d87 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 typealias MyList<T> = List<T>
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt.after
index 3553b7141b67..041f95f54307 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeAlias.kt.after
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 typealias MyList<T> = List<T>
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt
deleted file mode 100644
index c18d0ee96b69..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is List<*>) {
-        p.first.siz<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt.after
deleted file mode 100644
index 92001c8b7c87..000000000000
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.fir.kt.after
+++ /dev/null
@@ -1,9 +0,0 @@
-// FIR_COMPARISON
-fun test(p: Pair<Any, Any>) {
-    if (p.first is List<*>) {
-        (p.first as List<*>).size<caret>
-    }
-}
-
-// ELEMENT: length
-
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt
index c18d0ee96b69..9ad561b3a515 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is List<*>) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt.after
index fc8dcf576e22..4a373072f961 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/UnstableSmartCast_typeParams.kt.after
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FIR_COMPARISON
 fun test(p: Pair<Any, Any>) {
     if (p.first is List<*>) {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt
index 7f176275f906..5687884634b7 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 interface I {
     val p: Int
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt.after
index 7318800fea09..a2068ffac932 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter2.kt.after
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 interface I {
     val p: Int
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt
index 381c1e1aaf31..fad195bda979 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 interface I {
     val p: Int
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt.after
index dc46698c26e2..3ee3a830d291 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter3.kt.after
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 interface I {
     val p: Int
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt
index 65b9af331582..5c353da4c111 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 package ppp
 
 interface I {
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt.after
index fd5a7a0325a2..c06bf39f9f92 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ValInConstructorParameter4.kt.after
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+// FIR_COMPARISON
 package ppp
 
 interface I {
diff --git a/plugins/kotlin/core/kotlin.core.iml b/plugins/kotlin/core/kotlin.core.iml
index beea77f43f26..20aa22622b13 100644
--- a/plugins/kotlin/core/kotlin.core.iml
+++ b/plugins/kotlin/core/kotlin.core.iml
@@ -22,15 +22,15 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-ir" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.indexing.impl" />
@@ -46,5 +46,6 @@
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
     <orderEntry type="module" module-name="intellij.java.manifest" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
index 6c03786112d2..02ac6173c575 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
@@ -9,10 +9,10 @@ import com.intellij.psi.impl.CompositeShortNamesCache
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.PsiShortNamesCache
 import com.intellij.psi.stubs.StringStubIndexExtension
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.FrontendInternals
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
 import org.jetbrains.kotlin.idea.caches.KotlinShortNamesCache
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor
@@ -606,7 +606,7 @@ class KotlinIndicesHelper(
                 KotlinExceptionWithAttachments("KtElement not inside KtFile ($ktFile, is valid: ${ktFile.isValid})")
                     .withAttachment("file", ktFile)
                     .withAttachment("virtualFile", containingFile.virtualFile)
-                    .withAttachment("compiledFile", IDEKotlinBinaryClassCache.getInstance().isKotlinJvmCompiledFile(containingFile.virtualFile))
+                    .withAttachment("compiledFile", ClsKotlinBinaryClassCache.getInstance().isKotlinJvmCompiledFile(containingFile.virtualFile))
                     .withAttachment("element", this)
                     .withAttachment("type", javaClass)
                     .withPsiAttachment("file.kt", ktFile)
diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
index 0b2555b220f1..30000d225081 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
+++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.util.getParentResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
index a9b0932832da..42ff45262598 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
+++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/NameValidators.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.resolve.source.getPsi
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.util.*
 
diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
index 671b847a1580..3bccf37f8e89 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
+++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.idea.FrontendInternals
 import org.jetbrains.kotlin.idea.analysis.computeTypeInContext
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.references.resolveToDescriptors
@@ -17,7 +18,6 @@ import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
 import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.util.getImplicitReceiversWithInstanceToExpression
 import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.CallableId
diff --git a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
index 3643f600bc21..3ac48e3b1a6b 100644
--- a/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
+++ b/plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.core
 
@@ -36,11 +36,11 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.psi.typeRefHelpers.setReceiverTypeReference
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.OverridingUtil
+import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 import org.jetbrains.kotlin.resolve.calls.util.getParameterForArgument
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.util.getValueArgumentsInParentheses
 import org.jetbrains.kotlin.resolve.calls.util.isFakeElement
-import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 import org.jetbrains.kotlin.resolve.checkers.ExplicitApiDeclarationChecker
 import org.jetbrains.kotlin.resolve.checkers.explicitApiEnabled
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
@@ -273,7 +273,7 @@ fun PsiElement.deleteElementAndCleanParent() {
 
 // Delete element if it doesn't contain children of a given type
 private fun <T : PsiElement> deleteChildlessElement(element: PsiElement, childClass: Class<T>) {
-    if (PsiTreeUtil.getChildrenOfType<T>(element, childClass) == null) {
+    if (PsiTreeUtil.getChildrenOfType(element, childClass) == null) {
         element.delete()
     }
 }
@@ -333,8 +333,9 @@ fun KtModifierListOwner.setVisibility(visibilityModifier: KtModifierKeywordToken
         if (visibilityModifier == defaultVisibilityKeyword) {
             // Fake elements do not have ModuleInfo and languageVersionSettings because they can't be analysed
             // Effectively, this leads to J2K not respecting explicit api mode, but this case seems to be rare anyway.
-            val explicitVisibilityRequired = !this.isFakeElement && this.languageVersionSettings.explicitApiEnabled
-                    && this.resolveToDescriptorIfAny()?.let { !ExplicitApiDeclarationChecker.explicitVisibilityIsNotRequired(it) } == true
+            val explicitVisibilityRequired = !this.isFakeElement &&
+                    this.languageVersionSettings.explicitApiEnabled &&
+                    this.resolveToDescriptorIfAny()?.let { !ExplicitApiDeclarationChecker.explicitVisibilityIsNotRequired(it) } == true
 
             if (!explicitVisibilityRequired) {
                 this.visibilityModifierType()?.let { removeModifier(it) }
@@ -349,12 +350,16 @@ fun KtModifierListOwner.setVisibility(visibilityModifier: KtModifierKeywordToken
 fun KtDeclaration.implicitVisibility(): KtModifierKeywordToken? {
     return when {
         this is KtPropertyAccessor && isSetter && property.hasModifier(KtTokens.OVERRIDE_KEYWORD) -> {
-            (property.resolveToDescriptorIfAny() as? PropertyDescriptor)?.overriddenDescriptors?.forEach {
-                val visibility = it.setter?.visibility?.toKeywordToken()
-                if (visibility != null) return visibility
-            }
+            property.resolveToDescriptorIfAny()
+                ?.safeAs<PropertyDescriptor>()
+                ?.overriddenDescriptors?.forEach {
+                    val visibility = it.setter?.visibility?.toKeywordToken()
+                    if (visibility != null) return visibility
+                }
+
             KtTokens.DEFAULT_VISIBILITY_KEYWORD
         }
+
         this is KtConstructor<*> -> {
             // constructors cannot be declared in objects
             val klass = getContainingClassOrObject() as? KtClass ?: return KtTokens.DEFAULT_VISIBILITY_KEYWORD
@@ -364,18 +369,19 @@ fun KtDeclaration.implicitVisibility(): KtModifierKeywordToken? {
                 klass.isSealed() ->
                     if (klass.languageVersionSettings.supportsFeature(LanguageFeature.SealedInterfaces)) KtTokens.PROTECTED_KEYWORD
                     else KtTokens.PRIVATE_KEYWORD
+
                 else -> KtTokens.DEFAULT_VISIBILITY_KEYWORD
             }
         }
+
         hasModifier(KtTokens.OVERRIDE_KEYWORD) -> {
-            (resolveToDescriptorIfAny() as? CallableMemberDescriptor)
+            resolveToDescriptorIfAny()?.safeAs<CallableMemberDescriptor>()
                 ?.overriddenDescriptors
                 ?.let { OverridingUtil.findMaxVisibility(it) }
                 ?.toKeywordToken()
         }
-        else -> {
-            KtTokens.DEFAULT_VISIBILITY_KEYWORD
-        }
+
+        else -> KtTokens.DEFAULT_VISIBILITY_KEYWORD
     }
 }
 
@@ -386,12 +392,9 @@ fun KtModifierListOwner.canBePrivate(): Boolean {
 
     if (this is KtDeclaration) {
         if (hasActualModifier() || isExpectDeclaration()) return false
-        val containingClassOrObject = containingClassOrObject ?: return true
-        if (containingClassOrObject is KtClass &&
-            (containingClassOrObject.isInterface() || containingClassOrObject.isAnnotation())
-        ) {
-            return false
-        }
+        val containingClassOrObject = containingClassOrObject as? KtClass ?: return true
+        if (containingClassOrObject.isAnnotation()) return false
+        if (containingClassOrObject.isInterface() && !hasBody()) return false
     }
 
     return true
@@ -400,12 +403,12 @@ fun KtModifierListOwner.canBePrivate(): Boolean {
 fun KtModifierListOwner.canBePublic(): Boolean = !isSealedClassConstructor()
 
 fun KtModifierListOwner.canBeProtected(): Boolean {
-    val parent = when (this) {
-        is KtPropertyAccessor -> this.property.parent
-        else -> this.parent
-    }
-    return when (parent) {
-        is KtClassBody -> parent.parent is KtClass && !this.isFinalClassConstructor()
+    return when (val parent = if (this is KtPropertyAccessor) this.property.parent else this.parent) {
+        is KtClassBody -> {
+            val parentClass = parent.parent as? KtClass
+            parentClass != null && !parentClass.isInterface() && !this.isFinalClassConstructor()
+        }
+
         is KtParameterList -> parent.parent is KtPrimaryConstructor
         is KtClass -> !this.isAnnotationClassPrimaryConstructor() && !this.isFinalClassConstructor()
         else -> false
@@ -417,6 +420,7 @@ fun KtModifierListOwner.canBeInternal(): Boolean {
         val objectDeclaration = getStrictParentOfType<KtObjectDeclaration>() ?: return false
         if (objectDeclaration.isCompanion() && hasJvmFieldAnnotation()) return false
     }
+
     return !isAnnotationClassPrimaryConstructor() && !isSealedClassConstructor()
 }
 
@@ -488,6 +492,7 @@ fun KtDeclaration.getModalityFromDescriptor(descriptor: DeclarationDescriptor? =
     if (descriptor is MemberDescriptor) {
         return mapModality(descriptor.modality)
     }
+
     return null
 }
 
diff --git a/plugins/kotlin/core/tests/kotlin.core.tests.iml b/plugins/kotlin/core/tests/kotlin.core.tests.iml
index eadbce3d5a6e..a5edb82a4c07 100644
--- a/plugins/kotlin/core/tests/kotlin.core.tests.iml
+++ b/plugins/kotlin/core/tests/kotlin.core.tests.iml
@@ -18,12 +18,12 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-compiler" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.java" />
     <orderEntry type="module" module-name="intellij.java.indexing.impl" />
diff --git a/plugins/kotlin/docs/fir-ide/architecture/general-architecture.md b/plugins/kotlin/docs/fir-ide/architecture/general-architecture.md
new file mode 100644
index 000000000000..cf524be3a1bc
--- /dev/null
+++ b/plugins/kotlin/docs/fir-ide/architecture/general-architecture.md
@@ -0,0 +1,13 @@
+# General FIR IDE Architecture
+
+![](images/general-architecture.svg)
+
+The FIR IDE plugin has a layer architecture and consists of 4 layers, where layers **N** depends on layer **N-1** and there are no other dependencies between the layers:
+
+1. **FIR Compiler** Frontend.  [Read more about FIR](https://github.com/JetBrains/kotlin/blob/master/docs/fir/fir-basics.md).
+
+2. **Low-level API Layer**. The interlayer between **Analysis API** & **FIR** Mostly responsible for **KtElement → FirElement** mapping, lazy resolving of FIR Declarations, and diagnostics collecting.[Read more about Low-Level API](https://github.com/JetBrains/kotlin/blob/master/docs/analysis-api/low-level-api-fir.md).
+
+3. **Analysis API Layer**. The public API allows the Kotlin IDEA FIR plugin to interact with the compiler. The API surface is Kotlin frontend agnostic, and it can work via both Kotlin frontends FIR and FE1.0. [Read more about Analysis API](https://github.com/JetBrains/kotlin/blob/master/docs/analysis-api/analysis-api.md).
+
+4. **Plugin Subsystems layer**. The layer where the actual plugin is. All subsystems (completion/highlighting/find usages) live here. It does not interact directly with the Kotlin compiler(and corresponding modules do not have dependencies on compiler modules). To get Kotlin resolve information, it uses **Analysis API**.
\ No newline at end of file
diff --git a/plugins/kotlin/docs/fir-ide/architecture/images/general-architecture.svg b/plugins/kotlin/docs/fir-ide/architecture/images/general-architecture.svg
new file mode 100644
index 000000000000..507e2710b376
--- /dev/null
+++ b/plugins/kotlin/docs/fir-ide/architecture/images/general-architecture.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="444px" preserveAspectRatio="none" style="width:1094px;height:444px;background:#FFFFFF;" version="1.1" viewBox="0 0 1094 444" width="1094px" zoomAndPan="magnify"><defs><filter height="300%" id="fnb791yaosw4g" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><!--MD5=[6ad7c0b688d9e902153dd4de2b6da276]
+cluster plugin--><polygon fill="#FFFFFF" filter="url(#fnb791yaosw4g)" points="220,6,329,6,336,28.4883,1077,28.4883,1077,119,220,119,220,6" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="220" x2="336" y1="28.4883" y2="28.4883"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="103" x="224" y="21.5352">FIR IDE Plugin</text><!--MD5=[d145114503433d0fb74396bd53dbd25c]
+entity Other subsystems--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="46.4883" style="stroke:#A80036;stroke-width:1.5;" width="162" x="891" y="49"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="1033" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1031" y="56"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="1031" y="60"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="906" y="82.5352">Other subsystems</text><!--MD5=[edf9ae99e6703459d2d20b59cd1d1c0d]
+entity Highlighting--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="46.4883" style="stroke:#A80036;stroke-width:1.5;" width="125" x="730.5" y="49"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="835.5" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="833.5" y="56"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="833.5" y="60"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85" x="745.5" y="82.5352">Highlighting</text><!--MD5=[b3da2733087c08e258610b598fdd6789]
+entity Completion--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="46.4883" style="stroke:#A80036;stroke-width:1.5;" width="120" x="575" y="49"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="675" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="673" y="56"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="673" y="60"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="590" y="82.5352">Completion</text><!--MD5=[1d085ddff522cc5769a2492b7fc9c7ab]
+entity Find Usages--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="46.4883" style="stroke:#A80036;stroke-width:1.5;" width="123" x="416.5" y="49"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="519.5" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="517.5" y="56"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="517.5" y="60"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="83" x="431.5" y="82.5352">Find Usages</text><!--MD5=[d04a9a2bee163f2ba04888c3d8e4c6ed]
+entity Inspections--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="46.4883" style="stroke:#A80036;stroke-width:1.5;" width="118" x="263" y="49"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="361" y="54"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="359" y="56"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="359" y="60"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="78" x="278" y="82.5352">Inspections</text><!--MD5=[4e3a09270b53cd499ac6247cc36ef03d]
+entity fir--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="51.1992" style="stroke:#A80036;stroke-width:1.5;" width="158" x="556" y="379.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="694" y="384.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="692" y="386.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="692" y="390.5"/><text fill="#000000" font-family="sans-serif" font-size="18" font-weight="bold" lengthAdjust="spacing" textLength="118" x="571" y="416.9023">FIR Compiler</text><!--MD5=[e5e4aff23692c45099a835661ee4ea5b]
+entity ll--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="51.1992" style="stroke:#A80036;stroke-width:1.5;" width="173" x="548.5" y="268.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="701.5" y="273.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="699.5" y="275.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="699.5" y="279.5"/><text fill="#000000" font-family="sans-serif" font-size="18" font-weight="bold" lengthAdjust="spacing" textLength="133" x="563.5" y="305.9023">Low-Level API</text><!--MD5=[bc98c22ec29a4ee6d970209b2caf4b56]
+entity analysis--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="51.1992" style="stroke:#A80036;stroke-width:1.5;" width="154" x="558" y="157.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="692" y="162.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="690" y="164.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="690" y="168.5"/><text fill="#000000" font-family="sans-serif" font-size="18" font-weight="bold" lengthAdjust="spacing" textLength="114" x="573" y="194.9023">Analysis API</text><!--MD5=[30b2d8e6f553287acf1703da3e93c610]
+entity ij--><rect fill="#FEFECE" filter="url(#fnb791yaosw4g)" height="51.1992" style="stroke:#A80036;stroke-width:1.5;" width="186" x="7" y="46.5"/><rect fill="#FEFECE" height="10" style="stroke:#A80036;stroke-width:1.5;" width="15" x="173" y="51.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="171" y="53.5"/><rect fill="#FEFECE" height="2" style="stroke:#A80036;stroke-width:1.5;" width="4" x="171" y="57.5"/><text fill="#000000" font-family="sans-serif" font-size="18" font-weight="bold" lengthAdjust="spacing" textLength="146" x="22" y="83.9023">IntelliJ Platform</text><!--MD5=[47ad573ba6a053d9e1e44c8699adcd6f]
+link Highlighting to analysis--><path d="M766.19,95.04 C750.93,107.27 731.26,122.48 713,135 C703.3,141.65 692.65,148.4 682.43,154.63 " fill="none" id="Highlighting-to-analysis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="678.08,157.27,687.8494,156.0217,682.3548,154.6766,683.7,149.182,678.08,157.27" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[55a83d7621c017c8bd183dea3518c40f]
+link Completion to analysis--><path d="M635,95.06 C635,111.41 635,133.88 635,151.88 " fill="none" id="Completion-to-analysis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635,157.31,639,148.31,635,152.31,631,148.31,635,157.31" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[54959ee5a3b15b5107ac6a1d8f07e6bb]
+link Find Usages to analysis--><path d="M504.84,95 C520.11,107.22 539.77,122.43 558,135 C567.7,141.69 578.35,148.51 588.56,154.8 " fill="none" id="Find Usages-to-analysis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="592.9,157.46,587.3239,149.3417,588.6393,154.8435,583.1375,156.1589,592.9,157.46" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[35c745b18bef14dbde27458fb16fae59]
+link Inspections to analysis--><path d="M343.6,95.19 C358.04,108.73 378.17,125.26 399,135 C447.29,157.57 506.08,169.32 552.89,175.43 " fill="none" id="Inspections-to-analysis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="557.96,176.07,549.5328,170.9727,552.9995,175.4428,548.5293,178.9095,557.96,176.07" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[9a14564dae5e4ae3868d081a665885a3]
+link Other subsystems to analysis--><path d="M943.19,95 C924.2,108.47 898.26,124.99 873,135 C823.13,154.76 763.98,166.49 717.12,173.29 " fill="none" id="Other subsystems-to-analysis" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="712.04,174.02,721.512,176.7185,716.9906,173.3189,720.3902,168.7975,712.04,174.02" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[e1aab097e4838331ceb953c8626609b7]
+reverse link ij to plugin--><path d="M198.54,72 C203.36,72 208.18,72 213,72 C214.205,72 215.41,72 216.615,72 C217.2175,72 217.82,72 218.4225,72 C218.7238,72 219.025,72 219.3263,72 C219.4769,72 219.6275,72 219.7781,72 C219.8158,72 219.8534,72 219.8911,72 " fill="none" id="ij-backto-plugin" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="193.5,72,202.5,76,198.5,72,202.5,68,193.5,72" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[1d8267d94116d3ab6b94e1c2c89a1056]
+link analysis to ll--><path d="M635,208.73 C635,224.9 635,246.11 635,263.2 " fill="none" id="analysis-to-ll" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635,268.36,639,259.36,635,263.36,631,259.36,635,268.36" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[05fd97e95d1bbf6ed9865676fe40841d]
+link ll to fir--><path d="M635,319.73 C635,335.9 635,357.11 635,374.2 " fill="none" id="ll-to-fir" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="635,379.36,639,370.36,635,374.36,631,370.36,635,379.36" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[477fb20a911b210f6b9d7d6c69a638cd]
+@startuml
+
+component fir[
+= FIR Compiler
+]
+
+component ll [
+= Low-Level API
+]
+
+component analysis [
+= Analysis API
+]
+
+
+component ij [
+= IntelliJ Platform
+]
+
+package "FIR IDE Plugin" as plugin {
+    [Other subsystems]
+    [Highlighting]
+    [Completion]
+    [Find Usages]
+    [Inspections]
+}
+
+
+[Highlighting] - -> [analysis]
+[Completion]   - -> [analysis]
+[Find Usages]  - -> [analysis]
+[Inspections]  - -> [analysis]
+[Other subsystems] - -> [analysis]
+plugin -l-> [ij]
+
+[analysis] - -> [ll]
+[ll] - -> [fir]
+
+@enduml
+
+PlantUML version 1.2021.16(Wed Dec 08 18:25:22 CET 2021)
+--></g></svg>
\ No newline at end of file
diff --git a/plugins/kotlin/docs/fir-ide/development-process/environment-setup.md b/plugins/kotlin/docs/fir-ide/development-process/environment-setup.md
index 4d2120652506..85a4a3737873 100644
--- a/plugins/kotlin/docs/fir-ide/development-process/environment-setup.md
+++ b/plugins/kotlin/docs/fir-ide/development-process/environment-setup.md
@@ -8,7 +8,7 @@
 ## Setup
 
 1. Clone [kotlin](https://github.com/JetBrains/kotlin) repository. Kotlin repository contains Analysis API and Kotlin compiler
-2. Set up kotlin repository. See [kotlin/readme](https://github.com/JetBrains/kotlin/blob/master/ReadMe.md) for more info. But generally, it should be enough to this line to the `local.properties` file inside `kotlin` repository
+2. Set up kotlin repository. See [kotlin/readme](https://github.com/JetBrains/kotlin/blob/master/ReadMe.md) for more info. But generally, it should be enough to this line to the `<KOTLIN_REPO>/local.properties` file inside `kotlin` repository  (create `<KOTLIN_REPO>/local.properties` file if missing)
 ```
 kotlin.build.isObsoleteJdkOverrideEnabled=true
 ```
diff --git a/plugins/kotlin/fe10-analyze/safe-analyze-utils/build.gradle.kts b/plugins/kotlin/fe10-analyze/safe-analyze-utils/build.gradle.kts
new file mode 100644
index 000000000000..6984f6ad6d3c
--- /dev/null
+++ b/plugins/kotlin/fe10-analyze/safe-analyze-utils/build.gradle.kts
@@ -0,0 +1,68 @@
+// GENERATED build.gradle.kts
+// GENERATED BY kotlin.core.iml
+// USE `./gradlew generateIdePluginGradleFiles` TO REGENERATE THIS FILE
+
+plugins {
+    kotlin("jvm")
+    `java-library` // Add `compileOnlyApi` configuration
+    id("jps-compatible")
+}
+
+repositories {
+    maven { setUrl("https://cache-redirector.jetbrains.com/maven-central") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/intellij-dependencies") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/jcenter") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/repo.jenkins-ci.org/releases") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/www.myget.org/F/rd-snapshots/maven") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide") }
+    maven { setUrl("https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public") }
+}
+
+disableDependencyVerification()
+
+dependencies {
+    jpsLikeJarDependency(files(intellijCommunityDir.resolve("build/repo/org/jetbrains/kotlin/kotlin-stdlib/1.6.255/kotlin-stdlib-1.6.255.jar").canonicalPath), JpsDepScope.COMPILE)
+    jpsLikeJarDependency(files(intellijCommunityDir.resolve("build/repo/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.6.255/kotlin-compiler-common-for-ide-1.6.255.jar").canonicalPath), JpsDepScope.COMPILE, exported = true)
+    jpsLikeJarDependency(files(intellijCommunityDir.resolve("build/repo/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.6.255/kotlin-compiler-fe10-for-ide-1.6.255.jar").canonicalPath), JpsDepScope.COMPILE, exported = true)
+    jpsLikeModuleDependency(":kotlin-ide.kotlin.jps-common", JpsDepScope.COMPILE)
+    jpsLikeModuleDependency(":kotlin-ide.kotlin.common", JpsDepScope.COMPILE)
+    jpsLikeJarDependency(intellijPluginDep("java", forIde = true), JpsDepScope.COMPILE) // 'intellij.java' dependency
+    jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("intellij-core-analysis-deprecated") }) // 'intellij.java' dependency
+    jpsLikeJarDependency(intellijCoreDep(), JpsDepScope.COMPILE) // 'intellij.java' dependency
+    jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("platform-api") }) // 'intellij.java' dependency
+    jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("util") }) // 'intellij.java' dependency
+    jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("forms_rt") }) // 'intellij.java' dependency
+    jpsLikeJarDependency("org.jetbrains:annotations:20.1.0", JpsDepScope.COMPILE) // 'intellij.java' dependency
+    jpsLikeJarDependency("com.jgoodies:forms:1.1-preview", JpsDepScope.COMPILE) // 'intellij.java' dependency
+    jpsLikeJarDependency("org.jetbrains.intellij.deps:asm-all:9.1", JpsDepScope.COMPILE, { isTransitive = false }) // 'intellij.java.impl' dependency
+}
+
+configurations.all {
+    exclude(module = "tests-common") // Avoid classes with same FQN clashing
+}
+
+sourceSets {
+    "main" {
+        java.srcDir("src")
+    }
+    "test" {
+        java.srcDir("test")
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
+    kotlinOptions.freeCompilerArgs = listOf("-version", "-Xstrict-java-nullability-assertions", "-Xjvm-default=enable", "-Xskip-prerelease-check")
+    kotlinOptions.useOldBackend = true // KT-45697
+}
+
+testsJar()
+
diff --git a/plugins/kotlin/fe10-analyze/safe-analyze-utils/kotlin.fe10-analyze.safe-analyze-utils.iml b/plugins/kotlin/fe10-analyze/safe-analyze-utils/kotlin.fe10-analyze.safe-analyze-utils.iml
new file mode 100644
index 000000000000..1eac965e2362
--- /dev/null
+++ b/plugins/kotlin/fe10-analyze/safe-analyze-utils/kotlin.fe10-analyze.safe-analyze-utils.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
+    <orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
+    <orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
+    <orderEntry type="module" module-name="intellij.java" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/kotlin/fe10-analyze/safe-analyze-utils/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt b/plugins/kotlin/fe10-analyze/safe-analyze-utils/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt
new file mode 100644
index 000000000000..3e89c6a4c15d
--- /dev/null
+++ b/plugins/kotlin/fe10-analyze/safe-analyze-utils/src/org/jetbrains/kotlin/idea/util/safeAnalyze.kt
@@ -0,0 +1,54 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.util
+
+import com.intellij.injected.editor.VirtualFileWindow
+import com.intellij.openapi.roots.ProjectRootManager
+import com.intellij.openapi.vfs.NonPhysicalFileSystem
+import com.intellij.psi.PsiElement
+import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes
+import org.jetbrains.jps.model.java.JavaSourceRootProperties
+import org.jetbrains.jps.model.module.JpsModuleSourceRootType
+import org.jetbrains.kotlin.config.ALL_KOTLIN_SOURCE_ROOT_TYPES
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+/**
+ * Best effort to analyze element:
+ * - Best effort for file that is out of source root scope: NoDescriptorForDeclarationException could be swallowed
+ * - Do not swallow NoDescriptorForDeclarationException during analysis for in source scope files
+ */
+inline fun <T> PsiElement.actionUnderSafeAnalyzeBlock(
+    crossinline action: () -> T,
+    crossinline fallback: () -> T
+): T = try {
+    action()
+} catch (e: Exception) {
+    e.returnIfNoDescriptorForDeclarationException(condition = {
+        val file = containingFile
+        it && (!file.isPhysical || !file.isUnderKotlinSourceRootTypes())
+    }) { fallback() }
+}
+
+val Exception.isItNoDescriptorForDeclarationException: Boolean
+    get() = this is NoDescriptorForDeclarationException || cause?.safeAs<Exception>()?.isItNoDescriptorForDeclarationException == true
+
+inline fun <T> Exception.returnIfNoDescriptorForDeclarationException(
+    crossinline condition: (Boolean) -> Boolean = { v -> v },
+    crossinline computable: () -> T
+): T =
+    if (condition(this.isItNoDescriptorForDeclarationException)) {
+        computable()
+    } else {
+        throw this
+    }
+
+val KOTLIN_AWARE_SOURCE_ROOT_TYPES: Set<JpsModuleSourceRootType<JavaSourceRootProperties>> =
+    JavaModuleSourceRootTypes.SOURCES + ALL_KOTLIN_SOURCE_ROOT_TYPES
+
+fun PsiElement?.isUnderKotlinSourceRootTypes(): Boolean {
+    val ktFile = this?.containingFile.safeAs<KtFile>() ?: return false
+    val file = ktFile.virtualFile?.takeIf { it !is VirtualFileWindow && it.fileSystem !is NonPhysicalFileSystem } ?: return false
+    val projectFileIndex = ProjectRootManager.getInstance(ktFile.project).fileIndex
+    return projectFileIndex.isUnderSourceRootOfType(file, KOTLIN_AWARE_SOURCE_ROOT_TYPES)
+}
diff --git a/plugins/kotlin/fir-analysis-project-structure-ide-impl/src/org/jetbrains/kotlin/idea/fir/analysis/project/structure/ProjectStructureProviderIdeImpl.kt b/plugins/kotlin/fir-analysis-project-structure-ide-impl/src/org/jetbrains/kotlin/idea/fir/analysis/project/structure/ProjectStructureProviderIdeImpl.kt
index 53a2cd265f77..aef668193e63 100644
--- a/plugins/kotlin/fir-analysis-project-structure-ide-impl/src/org/jetbrains/kotlin/idea/fir/analysis/project/structure/ProjectStructureProviderIdeImpl.kt
+++ b/plugins/kotlin/fir-analysis-project-structure-ide-impl/src/org/jetbrains/kotlin/idea/fir/analysis/project/structure/ProjectStructureProviderIdeImpl.kt
@@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.fir.analysis.project.structure
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.util.containers.CollectionFactory
+import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
 import org.jetbrains.kotlin.analysis.project.structure.KtModule
 import org.jetbrains.kotlin.analysis.project.structure.ProjectStructureProvider
 import org.jetbrains.kotlin.analyzer.ModuleInfo
@@ -32,6 +33,10 @@ internal class ProjectStructureProviderIdeImpl : ProjectStructureProvider() {
         else -> TODO("Unsupported module info ${moduleInfo::class} $moduleInfo")
     }
 
+    override fun getKtLibraryModules(): Collection<KtLibraryModule> {
+        TODO("This is a temporary function used for Android LINT, and should not be called in the IDE")
+    }
+
     companion object {
         fun getInstance(project: Project):ProjectStructureProviderIdeImpl {
             return project.getService(ProjectStructureProvider::class.java) as ProjectStructureProviderIdeImpl
diff --git a/plugins/kotlin/fir-fe10-binding/kotlin.fir.fir-fe10-binding.iml b/plugins/kotlin/fir-fe10-binding/kotlin.fir.fir-fe10-binding.iml
index d2dd063dfd90..cc65548bdd57 100644
--- a/plugins/kotlin/fir-fe10-binding/kotlin.fir.fir-fe10-binding.iml
+++ b/plugins/kotlin/fir-fe10-binding/kotlin.fir.fir-fe10-binding.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt
index 4bdf87cdcba0..cd45a8b534d2 100644
--- a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt
+++ b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/BaseDescriptorsWrappers.kt
@@ -213,7 +213,7 @@ class KtSymbolBasedClassDescriptor(override val ktSymbol: KtNamedClassOrObjectSy
     override fun getDefaultType(): SimpleType {
         val arguments = TypeUtils.getDefaultTypeProjections(typeConstructor.parameters)
         return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-            Annotations.EMPTY, typeConstructor, arguments, false,
+            TypeAttributes.Empty, typeConstructor, arguments, false,
             MemberScopeForKtSymbolBasedDescriptors { "ktSymbol = $ktSymbol" }
         )
     }
@@ -241,7 +241,7 @@ class KtSymbolBasedClassDescriptor(override val ktSymbol: KtNamedClassOrObjectSy
 
     override fun getSealedSubclasses(): Collection<ClassDescriptor> = implementationPostponed()
 
-    override fun getInlineClassRepresentation(): InlineClassRepresentation<SimpleType> = TODO("Not yet implemented")
+    override fun getValueClassRepresentation(): ValueClassRepresentation<SimpleType> = TODO("Not yet implemented")
 
     override fun getMemberScope(typeArguments: MutableList<out TypeProjection>): MemberScope = noImplementation()
     override fun getMemberScope(typeSubstitution: TypeSubstitution): MemberScope = noImplementation()
@@ -263,7 +263,7 @@ class KtSymbolBasedTypeParameterDescriptor(
 
     override fun getDefaultType(): SimpleType =
         KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-            Annotations.EMPTY, typeConstructor, emptyList(), false,
+            TypeAttributes.Empty, typeConstructor, emptyList(), false,
             MemberScopeForKtSymbolBasedDescriptors { "ktSymbol = $ktSymbol" }
         )
 
diff --git a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/KtSymbolBasedKotlinTypes.kt b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/KtSymbolBasedKotlinTypes.kt
index 2322eddbbf22..12a3d9f7662f 100644
--- a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/KtSymbolBasedKotlinTypes.kt
+++ b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/KtSymbolBasedKotlinTypes.kt
@@ -20,6 +20,8 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorTypeKind
 import org.jetbrains.kotlin.types.checker.KotlinTypeRefiner
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -110,7 +112,7 @@ fun KtType.toKotlinType(context: FE10BindingContext, annotations: Annotations =
             is KtNamedClassOrObjectSymbol -> KtSymbolBasedClassDescriptor(classLikeSymbol, context).typeConstructor
             is KtAnonymousObjectSymbol -> context.implementationPostponed()
         }
-        is KtClassErrorType -> ErrorUtils.createErrorTypeConstructorWithCustomDebugName(error)
+        is KtClassErrorType -> ErrorUtils.createErrorTypeConstructor(ErrorTypeKind.TYPE_FOR_ERROR_TYPE_CONSTRUCTOR, error)
         is KtFlexibleType -> {
             return KotlinTypeFactory.flexibleType(
                 lowerBound.toKotlinType(context, annotations) as SimpleType,
@@ -131,7 +133,7 @@ fun KtType.toKotlinType(context: FE10BindingContext, annotations: Annotations =
     val markedAsNullable = this.nullability == KtTypeNullability.NULLABLE
 
     return KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-        annotations, typeConstructor, ktTypeArguments.map { it.toTypeProjection(context) }, markedAsNullable,
+        annotations.toDefaultAttributes(), typeConstructor, ktTypeArguments.map { it.toTypeProjection(context) }, markedAsNullable,
         MemberScopeForKtSymbolBasedDescriptors { this.asStringForDebugging() }
     )
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/binding/CallAndResolverCallWrappers.kt b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/binding/CallAndResolverCallWrappers.kt
index d5c98fd83847..b56f0f7909e2 100644
--- a/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/binding/CallAndResolverCallWrappers.kt
+++ b/plugins/kotlin/fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/binding/CallAndResolverCallWrappers.kt
@@ -226,7 +226,7 @@ class CallAndResolverCallWrappers(bindingContext: KtSymbolBasedBindingContext) {
         val ktCall = element.parent.safeAs<KtCallExpression>() ?: context.implementationPostponed()
         val firCall = when (val fir = ktCall.getOrBuildFir(context.ktAnalysisSessionFacade.firResolveState)) {
             is FirFunctionCall -> fir
-            is FirSafeCallExpression -> fir.regularQualifiedAccess as? FirFunctionCall
+            is FirSafeCallExpression -> fir.selector as? FirFunctionCall
             else -> null
         }
 
diff --git a/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml b/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml
index 049e7700ecb6..a666706f7c1a 100644
--- a/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml
+++ b/plugins/kotlin/fir-low-level-api-ide-impl/kotlin.fir.fir-low-level-api-ide-impl.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLibraryModuleDeclarationResolveTest.kt b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLibraryModuleDeclarationResolveTest.kt
index 25f9edb9b20c..4e57b3d6e510 100644
--- a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLibraryModuleDeclarationResolveTest.kt
+++ b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/AbstractFirLibraryModuleDeclarationResolveTest.kt
@@ -5,10 +5,11 @@
 package org.jetbrains.kotlin.idea.fir.low.level.api
 
 import com.intellij.testFramework.LightProjectDescriptor
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.withFirDeclaration
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.resolveToFirSymbol
 import org.jetbrains.kotlin.fir.FirRenderer
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.render
+import org.jetbrains.kotlin.fir.symbols.SymbolInternals
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor
@@ -33,13 +34,18 @@ abstract class AbstractFirLibraryModuleDeclarationResolveTest : KotlinLightCodeI
      * Compiled PSI-elements might come from indices, for example, and we need to be able to work with them
      * and to resolve them to FIR declarations.
      */
+    @OptIn(SymbolInternals::class)
     fun doTest(path: String) {
         val testDataFile = File(path)
         val expectedFile = File(path.removeSuffix(".kt") + ".txt")
 
         val ktFile = myFixture.configureByFile(testDataFile.name) as KtFile
 
-        val caretResolutionTarget = myFixture.elementAtCaret
+        val caretResolutionTarget = ktFile.findReferenceAt(myFixture.caretOffset)?.resolve()
+
+        require(caretResolutionTarget != null) {
+            "No reference at caret."
+        }
 
         require(caretResolutionTarget is KtDeclaration) {
             "Element at caret should be referencing some declaration, but referenced ${caretResolutionTarget::class} instead"
@@ -48,10 +54,8 @@ abstract class AbstractFirLibraryModuleDeclarationResolveTest : KotlinLightCodeI
         // We intentionally use ktFile here as a context element, because resolving
         // from compiled PSI-elements (e.g. caretResolutionTarget) is not yet supported
         resolveWithClearCaches(ktFile) { resolveState ->
-            val renderedDeclaration = caretResolutionTarget.withFirDeclaration(resolveState, FirResolvePhase.TYPES) { firDeclaration ->
-                firDeclaration.render(FirRenderer.RenderMode.WithResolvePhases)
-            }
-
+            val firSymbol = caretResolutionTarget.resolveToFirSymbol(resolveState, FirResolvePhase.TYPES)
+            val renderedDeclaration = firSymbol.fir.render(FirRenderer.RenderMode.WithResolvePhases)
             KotlinTestUtils.assertEqualsToFile(expectedFile, renderedDeclaration)
         }
     }
diff --git a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/FirLibraryModuleDeclarationResolveTestGenerated.java b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/FirLibraryModuleDeclarationResolveTestGenerated.java
index a73cd36f7316..6936b740619f 100644
--- a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/FirLibraryModuleDeclarationResolveTestGenerated.java
+++ b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/FirLibraryModuleDeclarationResolveTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.low.level.api;
 
@@ -9,8 +9,8 @@ import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.idea.test.TestRoot;
 import org.junit.runner.RunWith;
 
-/*
- * This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}.
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
  * DO NOT MODIFY MANUALLY.
  */
 @SuppressWarnings("all")
diff --git a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt
index a2f8631bcf65..7feb38ecf9f3 100644
--- a/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt
+++ b/plugins/kotlin/fir-low-level-api-ide-impl/test/org/jetbrains/kotlin/idea/fir/low/level/api/firTestUtils.kt
@@ -2,16 +2,16 @@
 
 package org.jetbrains.kotlin.idea.fir.low.level.api
 
-import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
+import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState
 import org.jetbrains.kotlin.analysis.low.level.api.fir.createResolveStateForNoCaching
-import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
+import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
 import org.jetbrains.kotlin.analysis.project.structure.getKtModule
 import org.jetbrains.kotlin.psi.KtElement
 
 internal inline fun <R> resolveWithClearCaches(
     context: KtElement,
-    noinline configureSession: FirIdeSession.() -> Unit = {},
-    action: (FirModuleResolveState) -> R,
+    noinline configureSession: LLFirSession.() -> Unit = {},
+    action: (LLFirModuleResolveState) -> R,
 ): R {
     val project = context.project
     val resolveState = createResolveStateForNoCaching(context.getKtModule(project), project, configureSession)
diff --git a/plugins/kotlin/fir/kotlin.fir.iml b/plugins/kotlin/fir/kotlin.fir.iml
index 2bc14254f28f..fcb4a8d67778 100644
--- a/plugins/kotlin/fir/kotlin.fir.iml
+++ b/plugins/kotlin/fir/kotlin.fir.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -50,5 +51,6 @@
     <orderEntry type="library" scope="RUNTIME" name="kotlinc.symbol-light-classes" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.analysis-project-structure-ide-impl" />
     <orderEntry type="library" name="kotlinc.analysis-project-structure" level="project" />
+    <orderEntry type="module" module-name="intellij.java.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
index 64383763fa21..c7f58156ada0 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirIconProvider.kt
@@ -2,15 +2,23 @@
 
 package org.jetbrains.kotlin.idea.completion
 
+import com.intellij.psi.PsiElement
 import com.intellij.util.PlatformIcons
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.*
+import org.jetbrains.kotlin.psi.KtElement
 import javax.swing.Icon
 
 internal object KotlinFirIconProvider {
     fun getIconFor(symbol: KtSymbol): Icon? {
+        symbol.psi?.let { referencedPsi ->
+            if (referencedPsi !is KtElement) {
+                return getIconForJavaDeclaration(referencedPsi)
+            }
+        }
+
         if (symbol is KtFunctionSymbol) {
             val isAbstract = symbol.modality == Modality.ABSTRACT
 
@@ -52,4 +60,9 @@ internal object KotlinFirIconProvider {
 
         return null
     }
+
+    private fun getIconForJavaDeclaration(declaration: PsiElement): Icon? {
+        val defaultIconFlags = 0
+        return declaration.getIcon(defaultIconFlags)
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCallableCompletionContributor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCallableCompletionContributor.kt
index f795bea614a4..518cffc2f143 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCallableCompletionContributor.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCallableCompletionContributor.kt
@@ -161,7 +161,8 @@ internal open class FirCallableCompletionContributor(
         val symbol = explicitReceiver.reference()?.resolveToSymbol()
         when {
             symbol is KtPackageSymbol -> collectDotCompletionForPackageReceiver(symbol, context, visibilityChecker)
-            symbol is KtNamedClassOrObjectSymbol && symbol.classKind == KtClassKind.ENUM_CLASS -> {
+
+            symbol is KtNamedClassOrObjectSymbol && symbol.hasImportantStaticMemberScope -> {
                 collectNonExtensions(symbol.getStaticMemberScope(), visibilityChecker, scopeNameFilter).forEach { memberSymbol ->
                     addCallableSymbolToCompletion(
                         context,
@@ -170,15 +171,24 @@ internal open class FirCallableCompletionContributor(
                     )
                 }
             }
-            symbol is KtNamedClassOrObjectSymbol && !symbol.classKind.isObject && symbol.companionObject == null -> {
+
+            symbol is KtNamedClassOrObjectSymbol && !symbol.canBeUsedAsReceiver -> {
                 // symbol cannot be used as callable receiver
             }
+
             else -> {
                 collectDotCompletionForCallableReceiver(implicitScopes, explicitReceiver, context, extensionChecker, visibilityChecker)
             }
         }
     }
 
+    private val KtNamedClassOrObjectSymbol.hasImportantStaticMemberScope: Boolean
+        get() = classKind == KtClassKind.ENUM_CLASS ||
+                origin == KtSymbolOrigin.JAVA
+
+    private val KtNamedClassOrObjectSymbol.canBeUsedAsReceiver: Boolean
+        get() = classKind.isObject || companionObject != null
+
     private fun KtAnalysisSession.collectDotCompletionForPackageReceiver(
         packageSymbol: KtPackageSymbol,
         context: WeighingContext,
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCompletionContributorBase.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCompletionContributorBase.kt
index 0c5fa4fdae72..3cf5d82eca7a 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCompletionContributorBase.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirCompletionContributorBase.kt
@@ -132,32 +132,34 @@ internal abstract class FirCompletionContributorBase<C : FirRawPositionCompletio
                     }
                 }
 
-            // Make the text gray and insert type cast if the receiver type does not match.
-            is CallableMetadataProvider.CallableKind.ReceiverCastRequired -> object : LookupElementDecorator<LookupElement>(this) {
-                override fun renderElement(presentation: LookupElementPresentation) {
-                    super.renderElement(presentation)
-                    presentation.itemTextForeground = LookupElementFactory.CAST_REQUIRED_COLOR
-                    // gray all tail fragments too:
-                    val fragments = presentation.tailFragments
-                    presentation.clearTail()
-                    for (fragment in fragments) {
-                        presentation.appendTailText(fragment.text, true)
-                    }
-                }
+            // TODO this code should be uncommented when KTIJ-20913 is fixed
+            //// Make the text gray and insert type cast if the receiver type does not match.
+            //is CallableMetadataProvider.CallableKind.ReceiverCastRequired -> object : LookupElementDecorator<LookupElement>(this) {
+            //    override fun renderElement(presentation: LookupElementPresentation) {
+            //        super.renderElement(presentation)
+            //        presentation.itemTextForeground = LookupElementFactory.CAST_REQUIRED_COLOR
+            //        // gray all tail fragments too:
+            //        val fragments = presentation.tailFragments
+            //        presentation.clearTail()
+            //        for (fragment in fragments) {
+            //            presentation.appendTailText(fragment.text, true)
+            //        }
+            //    }
+            //
+            //    override fun handleInsert(context: InsertionContext) {
+            //        super.handleInsert(context)
+            //        if (explicitReceiverRange == null || explicitReceiverText == null) return
+            //        val castType = explicitReceiverTypeHint ?: kind.fullyQualifiedCastType
+            //        val newReceiver = "(${explicitReceiverText} as $castType)"
+            //        context.document.replaceString(explicitReceiverRange.startOffset, explicitReceiverRange.endOffset, newReceiver)
+            //        context.commitDocument()
+            //        shortenReferencesInRange(
+            //            context.file as KtFile,
+            //            explicitReceiverRange.grown(newReceiver.length)
+            //        )
+            //    }
+            //}
 
-                override fun handleInsert(context: InsertionContext) {
-                    super.handleInsert(context)
-                    if (explicitReceiverRange == null || explicitReceiverText == null) return
-                    val castType = explicitReceiverTypeHint ?: kind.fullyQualifiedCastType
-                    val newReceiver = "(${explicitReceiverText} as $castType)"
-                    context.document.replaceString(explicitReceiverRange.startOffset, explicitReceiverRange.endOffset, newReceiver)
-                    context.commitDocument()
-                    shortenReferencesInRange(
-                        context.file as KtFile,
-                        explicitReceiverRange.grown(newReceiver.length)
-                    )
-                }
-            }
             else -> this
         }
     }
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportFirImpl.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportFirImpl.kt
index a412d09b2aec..d35b732402e0 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportFirImpl.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportFirImpl.kt
@@ -12,11 +12,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.analyseInModalWindow
-import org.jetbrains.kotlin.analysis.api.analyseWithReadAction
-import org.jetbrains.kotlin.analysis.api.calls.KtCall
-import org.jetbrains.kotlin.analysis.api.calls.KtCallableMemberCall
-import org.jetbrains.kotlin.analysis.api.calls.KtImplicitReceiverValue
-import org.jetbrains.kotlin.analysis.api.calls.calls
+import org.jetbrains.kotlin.analysis.api.calls.*
 import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind
@@ -25,11 +21,13 @@ import org.jetbrains.kotlin.idea.core.util.showYesNoCancelDialog
 import org.jetbrains.kotlin.idea.refactoring.CHECK_SUPER_METHODS_YES_NO_DIALOG
 import org.jetbrains.kotlin.idea.refactoring.formatPsiClass
 import org.jetbrains.kotlin.idea.references.KtInvokeFunctionReference
+import org.jetbrains.kotlin.idea.util.withResolvedCall
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 class KotlinFindUsagesSupportFirImpl : KotlinFindUsagesSupport {
@@ -40,10 +38,9 @@ class KotlinFindUsagesSupportFirImpl : KotlinFindUsagesSupport {
         val klass = companionObject.getStrictParentOfType<KtClass>() ?: return true
         return !klass.anyDescendantOfType(fun(element: KtElement): Boolean {
             if (element == companionObject) return false
-            var result = false
-            forResolvedCall(element) { call ->
+            return withResolvedCall(element) { call ->
                 if (callReceiverRefersToCompanionObject(call, companionObject)) {
-                    result = element.references.any {
+                    element.references.any {
                         // We get both a simple named reference and an invoke function
                         // reference for all function calls. We want the named reference.
                         //
@@ -53,18 +50,13 @@ class KotlinFindUsagesSupportFirImpl : KotlinFindUsagesSupport {
                         // We should make FIR references behave the same.
                         it !is KtInvokeFunctionReference && !referenceProcessor.process(it)
                     }
+                } else {
+                    false
                 }
-            }
-            return result
+            } ?: false
         })
     }
 
-    private fun forResolvedCall(element: KtElement, block: KtAnalysisSession.(KtCall) -> Unit) {
-        analyseWithReadAction(element) {
-            element.resolveCall()?.calls?.singleOrNull()?.let { block(it) }
-        }
-    }
-
     private fun KtAnalysisSession.callReceiverRefersToCompanionObject(call: KtCall, companionObject: KtObjectDeclaration): Boolean {
         if (call !is KtCallableMemberCall<*, *>) return false
         val dispatchReceiver = call.partiallyAppliedSymbol.dispatchReceiver
@@ -89,9 +81,20 @@ class KotlinFindUsagesSupportFirImpl : KotlinFindUsagesSupport {
         return (declaration as? KtNamedDeclaration)?.name ?: "SUPPORT FOR FIR"
     }
 
-    override fun isConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean {
-        // TODO: implement this
-        return false
+    override fun isKotlinConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean {
+        val element = psiReference.element
+        if (element !is KtElement) return false
+
+        val constructorCalleeExpression = element.getNonStrictParentOfType<KtConstructorCalleeExpression>() ?: return false
+        return withResolvedCall(constructorCalleeExpression) { call ->
+            when (call) {
+                is KtDelegatedConstructorCall -> {
+                    val constructedClassSymbol = call.symbol.containingClassIdIfNonLocal?.getCorrespondingToplevelClassOrObjectSymbol()
+                    constructedClassSymbol == ktClassOrObject.getClassOrObjectSymbol()
+                }
+                else -> false
+            }
+        } ?: false
     }
 
     override fun getSuperMethods(declaration: KtDeclaration, ignore: Collection<PsiElement>?): List<PsiElement> {
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/HiglightingFactory.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/HiglightingFactory.kt
new file mode 100644
index 000000000000..5f15fb41d8e6
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/HiglightingFactory.kt
@@ -0,0 +1,22 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.fir.highlighter
+
+import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.openapi.editor.colors.TextAttributesKey
+import com.intellij.openapi.util.TextRange
+import com.intellij.util.applyIf
+
+internal object HiglightingFactory {
+    fun createInfoAnnotation(holder: AnnotationHolder, textRange: TextRange, message: String?, textAttributes: TextAttributesKey?) {
+        val builder =
+            if (message == null) holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+            else holder.newAnnotation(HighlightSeverity.INFORMATION, message)
+        builder
+            .range(textRange)
+            .applyIf(textAttributes != null) {
+                textAttributes(textAttributes!!)
+            }
+            .create()
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinHighLevelDiagnosticHighlightingPass.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinHighLevelDiagnosticHighlightingPass.kt
index aa9b17b3b6da..a75759b77c01 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinHighLevelDiagnosticHighlightingPass.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/KotlinHighLevelDiagnosticHighlightingPass.kt
@@ -37,7 +37,7 @@ class KotlinHighLevelDiagnosticHighlightingPass(
 ) : TextEditorHighlightingPass(ktFile.project, document) {
 
     @Suppress("UnstableApiUsage")
-    val annotationHolder = AnnotationHolderImpl(AnnotationSession(ktFile))
+    val annotationHolder = AnnotationHolderImpl(AnnotationSession(ktFile), false)
 
     override fun doCollectInformation(progress: ProgressIndicator) {
         analyse(ktFile) {
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AbstractBeforeResolveHiglightingVisitory.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AbstractBeforeResolveHiglightingVisitory.kt
new file mode 100644
index 000000000000..e1215b2c51b1
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AbstractBeforeResolveHiglightingVisitory.kt
@@ -0,0 +1,16 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.fir.highlighter.beforeResolve
+
+import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.openapi.editor.colors.TextAttributesKey
+import com.intellij.openapi.util.TextRange
+import com.intellij.util.applyIf
+import org.jetbrains.kotlin.idea.fir.highlighter.HiglightingFactory
+import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingVisitor
+
+abstract class AbstractBeforeResolveHiglightingVisitory(protected val holder: AnnotationHolder): AbstractHighlightingVisitor() {
+    override fun createInfoAnnotation(textRange: TextRange, message: String?, textAttributes: TextAttributesKey?) {
+        HiglightingFactory.createInfoAnnotation(holder, textRange, message, textAttributes)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AnnotationEntryHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AnnotationEntryHighlightingVisitor.kt
new file mode 100644
index 000000000000..0fa128b53c8f
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/AnnotationEntryHighlightingVisitor.kt
@@ -0,0 +1,35 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.fir.highlighter.beforeResolve
+
+import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.openapi.util.TextRange
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingVisitor
+import org.jetbrains.kotlin.idea.highlighter.BeforeResolveHighlightingExtension
+import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors
+import org.jetbrains.kotlin.idea.highlighter.NameHighlighter
+import org.jetbrains.kotlin.psi.KtAnnotationEntry
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
+
+internal class AnnotationEntryHighlightingVisitor(
+    holder: AnnotationHolder
+) : AbstractBeforeResolveHiglightingVisitory(holder) {
+    override fun visitAnnotationEntry(annotationEntry: KtAnnotationEntry) {
+        if (!NameHighlighter.namesHighlightingEnabled) return
+        val range = annotationEntry.getTextRangeToHiglight() ?: return
+        createInfoAnnotation(range, textAttributes = KotlinHighlightingColors.ANNOTATION)
+    }
+
+    private fun KtAnnotationEntry.getTextRangeToHiglight(): TextRange? {
+        val atSymbol = atSymbol ?: return null
+        val typeReference = typeReference ?: return null
+        return TextRange(atSymbol.startOffset, typeReference.endOffset)
+    }
+}
+
+class AnnotationsHighlightingExtension : BeforeResolveHighlightingExtension {
+    override fun createVisitor(holder: AnnotationHolder): AbstractHighlightingVisitor =
+        AnnotationEntryHighlightingVisitor(holder)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/DeclarationHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/DeclarationHighlightingVisitor.kt
new file mode 100644
index 000000000000..e25006a87395
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/beforeResolve/DeclarationHighlightingVisitor.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.fir.highlighter.beforeResolve
+
+import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.lang.annotation.HighlightSeverity
+import com.intellij.psi.util.PsiUtilCore
+import org.jetbrains.kotlin.idea.highlighter.textAttributesForClass
+import org.jetbrains.kotlin.idea.highlighter.textAttributesForKtParameterDeclaration
+import org.jetbrains.kotlin.idea.highlighter.textAttributesForKtPropertyDeclaration
+import org.jetbrains.kotlin.idea.highlighter.*
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors as Colors
+
+internal class DeclarationHighlightingVisitor(holder: AnnotationHolder) : AbstractBeforeResolveHiglightingVisitory(holder) {
+    override fun visitTypeAlias(typeAlias: KtTypeAlias) {
+        highlightNamedDeclaration(typeAlias, Colors.TYPE_ALIAS)
+        super.visitTypeAlias(typeAlias)
+    }
+
+    override fun visitObjectDeclaration(declaration: KtObjectDeclaration) {
+        highlightNamedDeclaration(declaration, Colors.OBJECT)
+        super.visitObjectDeclaration(declaration)
+    }
+
+    override fun visitClass(klass: KtClass) {
+        highlightNamedDeclaration(klass, textAttributesForClass(klass))
+        super.visitClass(klass)
+    }
+
+    override fun visitProperty(property: KtProperty) {
+        textAttributesForKtPropertyDeclaration(property)?.let { attributes ->
+            highlightNamedDeclaration(property, attributes)
+        }
+        highlightMutability(property)
+        super.visitProperty(property)
+    }
+
+    override fun visitParameter(parameter: KtParameter) {
+        textAttributesForKtParameterDeclaration(parameter)?.let { attributes ->
+            highlightNamedDeclaration(parameter, attributes)
+        }
+        highlightMutability(parameter)
+        super.visitParameter(parameter)
+    }
+
+
+    private fun <D> highlightMutability(declaration: D) where D : KtValVarKeywordOwner, D : KtNamedDeclaration {
+        if (PsiUtilCore.getElementType(declaration.valOrVarKeyword) == KtTokens.VAR_KEYWORD) {
+            highlightNamedDeclaration(declaration, Colors.MUTABLE_VARIABLE)
+        }
+    }
+}
+
+class DeclarationHighlightingExtension : BeforeResolveHighlightingExtension {
+    override fun createVisitor(holder: AnnotationHolder): AbstractHighlightingVisitor =
+        DeclarationHighlightingVisitor(holder)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/DeclarationHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/DeclarationHighlightingVisitor.kt
deleted file mode 100644
index d28c062c6474..000000000000
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/DeclarationHighlightingVisitor.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.fir.highlighter.visitors
-
-import com.intellij.lang.annotation.AnnotationHolder
-import com.intellij.lang.annotation.HighlightSeverity
-import com.intellij.psi.util.PsiUtilCore
-import org.jetbrains.kotlin.idea.highlighter.textAttributesForClass
-import org.jetbrains.kotlin.idea.highlighter.textAttributesForKtParameterDeclaration
-import org.jetbrains.kotlin.idea.highlighter.textAttributesForKtPropertyDeclaration
-import org.jetbrains.kotlin.idea.highlighter.*
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors as Colors
-
-internal class DeclarationHighlightingVisitor(private val holder: AnnotationHolder) : AbstractHighlightingVisitor() {
-    override fun visitTypeAlias(typeAlias: KtTypeAlias) {
-        highlightNamedDeclaration(typeAlias, Colors.TYPE_ALIAS)
-        super.visitTypeAlias(typeAlias)
-    }
-
-    override fun visitObjectDeclaration(declaration: KtObjectDeclaration) {
-        highlightNamedDeclaration(declaration, Colors.OBJECT)
-        super.visitObjectDeclaration(declaration)
-    }
-
-    override fun createInfoAnnotation(
-        textRange: com.intellij.openapi.util.TextRange,
-        message: kotlin.String?,
-        textAttributes: com.intellij.openapi.editor.colors.TextAttributesKey?
-    ) {
-        return (message?.let { holder.newAnnotation(HighlightSeverity.INFORMATION, it) }
-            ?: holder.newSilentAnnotation(HighlightSeverity.INFORMATION))
-            .range(textRange)
-            .also { builder ->
-                textAttributes?.let {
-                    builder.textAttributes(it)
-                }
-            }
-            .create()
-    }
-
-    override fun visitClass(klass: KtClass) {
-        highlightNamedDeclaration(klass, textAttributesForClass(klass))
-        super.visitClass(klass)
-    }
-
-    override fun visitProperty(property: KtProperty) {
-        textAttributesForKtPropertyDeclaration(property)?.let { attributes ->
-            highlightNamedDeclaration(property, attributes)
-        }
-        highlightMutability(property)
-        super.visitProperty(property)
-    }
-
-    override fun visitParameter(parameter: KtParameter) {
-        textAttributesForKtParameterDeclaration(parameter)?.let { attributes ->
-            highlightNamedDeclaration(parameter, attributes)
-        }
-        highlightMutability(parameter)
-        super.visitParameter(parameter)
-    }
-
-
-    private fun <D> highlightMutability(declaration: D) where D : KtValVarKeywordOwner, D : KtNamedDeclaration {
-        if (PsiUtilCore.getElementType(declaration.valOrVarKeyword) == KtTokens.VAR_KEYWORD) {
-            highlightNamedDeclaration(declaration, Colors.MUTABLE_VARIABLE)
-        }
-    }
-}
-
-class DeclarationHighlightingExtension : BeforeResolveHighlightingExtension {
-    override fun createVisitor(holder: AnnotationHolder): AbstractHighlightingVisitor =
-        DeclarationHighlightingVisitor(holder)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FirAfterResolveHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FirAfterResolveHighlightingVisitor.kt
index b7d71d9d4720..ff64768728bb 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FirAfterResolveHighlightingVisitor.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FirAfterResolveHighlightingVisitor.kt
@@ -3,9 +3,12 @@
 package org.jetbrains.kotlin.idea.fir.highlighter.visitors
 
 import com.intellij.lang.annotation.AnnotationHolder
+import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.util.TextRange
+import com.intellij.util.applyIf
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.idea.fir.highlighter.HiglightingFactory
 import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingVisitor
 
 abstract class FirAfterResolveHighlightingVisitor(
@@ -14,9 +17,7 @@ abstract class FirAfterResolveHighlightingVisitor(
 ) : AbstractHighlightingVisitor() {
 
     override fun createInfoAnnotation(textRange: TextRange, message: String?, textAttributes: TextAttributesKey?) {
-        // TODO: Temporary use deprecated for FIR plugin as it is supposes to be rewritten fully
-        holder.createInfoAnnotation(textRange, message)
-            .also { annotation -> textAttributes?.let { annotation.textAttributes = textAttributes } }
+        HiglightingFactory.createInfoAnnotation(holder, textRange, message, textAttributes)
     }
 
     companion object {
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/TypeHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/TypeHighlightingVisitor.kt
index bce0c124f88e..2726ea372076 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/TypeHighlightingVisitor.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/TypeHighlightingVisitor.kt
@@ -28,29 +28,29 @@ internal class TypeHighlightingVisitor(
             return
         }
         val target = expression.mainReference.resolve() ?: return
+        if (isAnnotationCall(expression, target)) {
+            // higlighted by AnnotationEntryHiglightingVisitor
+            return
+        }
         textAttributesKeyForTypeDeclaration(target)?.let { key ->
             if (expression.isConstructorCallReference() && key != Colors.ANNOTATION) {
                 // Do not highlight constructor call as class reference
                 return@let
             }
-            highlightName(computeHighlightingRangeForUsage(expression, target), key)
+            highlightName(expression.textRange, key)
         }
     }
 
-
-    private fun computeHighlightingRangeForUsage(expression: KtSimpleNameExpression, target: PsiElement): TextRange {
+    private fun isAnnotationCall(expression: KtSimpleNameExpression, target: PsiElement): Boolean {
         val expressionRange = expression.textRange
 
         val isKotlinAnnotation = target is KtPrimaryConstructor && target.parent.isAnnotationClass()
-        if (!isKotlinAnnotation && !target.isAnnotationClass()) return expressionRange
+        if (!isKotlinAnnotation && !target.isAnnotationClass()) return false
 
-        // include '@' symbol if the reference is the first segment of KtAnnotationEntry
-        // if "Deprecated" is highlighted then '@' should be highlighted too in "@Deprecated"
         val annotationEntry = PsiTreeUtil.getParentOfType(
             expression, KtAnnotationEntry::class.java, /* strict = */false, KtValueArgumentList::class.java
         )
-        val atSymbol = annotationEntry?.atSymbol ?: return expressionRange
-        return TextRange(atSymbol.textRange.startOffset, expression.textRange.endOffset)
+       return annotationEntry?.atSymbol != null
     }
 }
 
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/VariableReferenceHighlightingVisitor.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/VariableReferenceHighlightingVisitor.kt
index 08d1776f9a5d..81aeb2abcf0e 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/VariableReferenceHighlightingVisitor.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/VariableReferenceHighlightingVisitor.kt
@@ -3,21 +3,20 @@
 package org.jetbrains.kotlin.idea.fir.highlighter.visitors
 
 import com.intellij.lang.annotation.AnnotationHolder
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiMethod
-import com.intellij.psi.PsiModifier
-import com.intellij.psi.PsiVariable
-import com.intellij.psi.util.PsiUtilCore
-import com.intellij.psi.util.parentOfType
-import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle
-import org.jetbrains.kotlin.idea.highlighter.textAttributesKeyForPropertyDeclaration
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.symbols.KtBackingFieldSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtSyntheticJavaPropertySymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtVariableSymbol
+import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle
 import org.jetbrains.kotlin.idea.highlighter.NameHighlighter
+import org.jetbrains.kotlin.idea.highlighter.textAttributesKeyForPropertyDeclaration
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.KtInstanceExpressionWithLabel
+import org.jetbrains.kotlin.psi.KtOperationReferenceExpression
+import org.jetbrains.kotlin.psi.KtSimpleNameExpression
+import org.jetbrains.kotlin.psi.KtValueArgumentName
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors as Colors
 
 internal class VariableReferenceHighlightingVisitor(
@@ -41,15 +40,17 @@ internal class VariableReferenceHighlightingVisitor(
 
         with(analysisSession) {
             val targetSymbol = expression.mainReference.resolveToSymbol()
-            val target = expression.mainReference.resolve()
+            val targetPsi = targetSymbol?.psi
             when {
                 targetSymbol is KtBackingFieldSymbol -> Colors.BACKING_FIELD_VARIABLE
-                target is PsiMethod -> Colors.SYNTHETIC_EXTENSION_PROPERTY
-                target != null -> textAttributesKeyForPropertyDeclaration(target)
+                targetSymbol is KtSyntheticJavaPropertySymbol -> Colors.SYNTHETIC_EXTENSION_PROPERTY
+                targetPsi != null -> textAttributesKeyForPropertyDeclaration(targetPsi)
                 else -> null
             }?.let { attribute ->
                 highlightName(expression, attribute)
-                if (target?.isMutableVariable() == true || targetSymbol != null && isBackingFieldReferencingMutableVariable(targetSymbol)) {
+                if (isMutableVariable(targetSymbol) == true
+                    || targetSymbol != null && isBackingFieldReferencingMutableVariable(targetSymbol)
+                ) {
                     highlightName(expression, Colors.MUTABLE_VARIABLE)
                 }
             }
@@ -71,9 +72,9 @@ internal class VariableReferenceHighlightingVisitor(
     }
 }
 
-private fun PsiElement.isMutableVariable() = when {
-    this is KtValVarKeywordOwner && PsiUtilCore.getElementType(valOrVarKeyword) == KtTokens.VAR_KEYWORD -> true
-    this is PsiVariable && !hasModifierProperty(PsiModifier.FINAL) -> true
+@Suppress("unused")
+private fun KtAnalysisSession.isMutableVariable(symbol: KtSymbol?): Boolean = when (symbol) {
+    is KtVariableSymbol -> !symbol.isVal
     else -> false
 }
 
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
index c5203435ecdf..bdd68250f040 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt
@@ -12,6 +12,7 @@ import com.intellij.ui.JBColor
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.analyse
 import org.jetbrains.kotlin.analysis.api.annotations.annotations
+import org.jetbrains.kotlin.analysis.api.calls.KtApplicableCallCandidateInfo
 import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtVariableLikeSignature
@@ -115,7 +116,9 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
             // `context.itemsToShow` array which becomes `context.objectsToView` array in updateParameterInfo(). Unfortunately
             // `objectsToView` is read-only so we can't change the size of the array. So we have to store an array here of the correct size,
             // which does mean we have to resolve here to know the number of candidates.
-            val candidatesWithMapping = resolveCallCandidates(callElement)
+            val candidatesWithMapping = collectCallCandidates(callElement)
+
+            // TODO: Filter shadowed candidates. See use of ShadowedDeclarationsFilter in KotlinFunctionParameterInfoHandler.kt.
             context.itemsToShow = Array(candidatesWithMapping.size) { CandidateInfo() }
 
             argumentList
@@ -145,7 +148,8 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                 is KtArrayAccessExpression -> Pair(null, callElement.indexExpressions)
                 else -> return@analyse
             }
-            val candidatesWithMapping = resolveCallCandidates(callElement)
+            val candidatesWithMapping = collectCallCandidates(callElement)
+            val hasMultipleApplicableBestCandidates = candidatesWithMapping.count { it.isApplicableBestCandidate } > 1
 
             for ((index, objectToView) in context.objectsToView.withIndex()) {
                 val candidateInfo = objectToView as? CandidateInfo ?: continue
@@ -154,7 +158,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                     // Number of candidates somehow changed while UI is shown, which should NOT be possible. Bail out to be safe.
                     return
                 }
-                val (candidateSignature, argumentMapping) = candidatesWithMapping[index]
+                val (candidateSignature, argumentMapping, isApplicableBestCandidate) = candidatesWithMapping[index]
 
                 // For array set calls, we only want the index arguments in brackets, which are all except the last (the value to set).
                 val isArraySetCall = candidateSignature.symbol.callableIdIfNonLocal?.let {
@@ -205,8 +209,10 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                     setValueParameter
                 )
 
-                // TODO: This should be changed when there are multiple candidates available; need to know which one the call is resolved to
-                val isCallResolvedToCandidate = candidatesWithMapping.size == 1
+                // We want to highlight the candidate green if it is the only best/final candidate selected and is applicable.
+                // However, if there is only one candidate available, we want to highlight it green regardless of its applicability.
+                val shouldHighlightGreen = (isApplicableBestCandidate && !hasMultipleApplicableBestCandidates)
+                        || candidatesWithMapping.size == 1
 
                 candidateInfo.callInfo = CallInfo(
                     callElement,
@@ -215,10 +221,10 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                     argumentToParameterIndex,
                     valueParameters.size,
                     parameterIndexToText,
-                    isCallResolvedToCandidate,
+                    shouldHighlightGreen,
                     hasTypeMismatchBeforeCurrent,
                     highlightParameterIndex,
-                    candidateSignature.symbol.deprecationStatus != null,
+                    isDeprecated = candidateSignature.symbol.deprecationStatus != null,
                 )
             }
         }
@@ -251,7 +257,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
             }
 
             if (includeName) {
-                append(parameter.symbol.name)
+                append(parameter.name)
                 append(": ")
             }
 
@@ -388,9 +394,10 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
             var isDisabledBeforeHighlight = false
             var hasUnmappedArgument = false
             var hasUnmappedArgumentBeforeCurrent = false
+            var lastMappedArgumentIndex = -1
+            var namedMode = false
             val usedParameterIndices = HashSet<Int>()
             val text = buildString {
-                var namedMode = false
                 var argumentIndex = 0
 
                 fun appendParameter(
@@ -452,6 +459,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                             argumentIndex++
                             continue
                         }
+                        lastMappedArgumentIndex = argumentIndex
                         if (!usedParameterIndices.add(parameterIndex)) continue
 
                         val shouldHighlight = parameterIndex == highlightParameterIndex
@@ -463,12 +471,13 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                         val parameterIndex = argumentToParameterIndex[argument]
                         if (parameterIndex == null) {
                             hasUnmappedArgument = true
-                            if (argumentIndex <= currentArgumentIndex) {
+                            if (argumentIndex < currentArgumentIndex) {
                                 hasUnmappedArgumentBeforeCurrent = true
                             }
                             argumentIndex++
                             continue
                         }
+                        lastMappedArgumentIndex = argumentIndex
                         if (!usedParameterIndices.add(parameterIndex)) continue
 
                         val shouldHighlight = parameterIndex == highlightParameterIndex
@@ -493,14 +502,15 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
                 }
             }
 
-            val backgroundColor = if (isCallResolvedToCandidate) GREEN_BACKGROUND else context.defaultParameterColor
+            val backgroundColor = if (shouldHighlightGreen) GREEN_BACKGROUND else context.defaultParameterColor
 
             // Disabled when there are too many arguments.
             val allParametersUsed = usedParameterIndices.size == valueParameterCount
             val supportsTrailingCommas = callElement.languageVersionSettings.supportsFeature(LanguageFeature.TrailingCommas)
             val afterTrailingComma = arguments.isNotEmpty() && currentArgumentIndex == arguments.size
             val isInPositionToEnterArgument = !supportsTrailingCommas && afterTrailingComma
-            val tooManyArgs = allParametersUsed && (isInPositionToEnterArgument || hasUnmappedArgument)
+            val isAfterMappedArgs = currentArgumentIndex > lastMappedArgumentIndex
+            val tooManyArgs = allParametersUsed && (isInPositionToEnterArgument || hasUnmappedArgument) && (isAfterMappedArgs || namedMode)
 
             val isDisabled = tooManyArgs || hasTypeMismatchBeforeCurrent || hasUnmappedArgumentBeforeCurrent
 
@@ -525,7 +535,7 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase<TArgumentList : K
         val argumentToParameterIndex: LinkedHashMap<KtExpression, Int>,
         val valueParameterCount: Int,
         val parameterIndexToText: Map<Int, String>,
-        val isCallResolvedToCandidate: Boolean,
+        val shouldHighlightGreen: Boolean,
         val hasTypeMismatchBeforeCurrent: Boolean,
         val highlightParameterIndex: Int?,
         val isDeprecated: Boolean,
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelTypeArgumentInfoHandler.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelTypeArgumentInfoHandler.kt
index b39699a0f0c5..14c502dadae3 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelTypeArgumentInfoHandler.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelTypeArgumentInfoHandler.kt
@@ -51,7 +51,7 @@ class KotlinHighLevelFunctionTypeArgumentInfoHandler : KotlinHighLevelTypeArgume
         // will NOT return a KtCall because there is no FirFunctionCall there. We find the symbols using the callee name instead.
         val reference = callElement.calleeExpression?.references?.singleOrNull() as? KtSimpleNameReference ?: return null
         val parent = callElement.parent
-        val receiver = if (parent is KtDotQualifiedExpression && parent.selectorExpression == callElement) {
+        val receiver = if (parent is KtQualifiedExpression && parent.selectorExpression == callElement) {
             parent.receiverExpression
         } else null
         val fileSymbol = callElement.containingKtFile.getFileSymbol()
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
index 73f93f18a729..7671b35b42e0 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/utils.kt
@@ -2,39 +2,51 @@
 package org.jetbrains.kotlin.idea.parameterInfo
 
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
-import org.jetbrains.kotlin.analysis.api.calls.KtFunctionCall
-import org.jetbrains.kotlin.analysis.api.calls.calls
-import org.jetbrains.kotlin.analysis.api.calls.symbol
+import org.jetbrains.kotlin.analysis.api.calls.*
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility
+import org.jetbrains.kotlin.analysis.api.types.KtTypeNullability
 import org.jetbrains.kotlin.psi.*
 
 // Analogous to Call.resolveCandidates() in plugins/kotlin/core/src/org/jetbrains/kotlin/idea/core/Utils.kt
-internal fun KtAnalysisSession.resolveCallCandidates(callElement: KtElement): List<CandidateWithMapping> {
-    // TODO: FE 1.0 plugin collects all candidates (i.e., all overloads), even if arguments do not match. Not just resolved call.
-    // See Call.resolveCandidates() in core/src/org/jetbrains/kotlin/idea/core/Utils.kt. Note `replaceCollectAllCandidates(true)`.
-
-    val (resolvedCall, receiver) = when (callElement) {
+internal fun KtAnalysisSession.collectCallCandidates(callElement: KtElement): List<CandidateWithMapping> {
+    val (candidates, receiver) = when (callElement) {
         is KtCallElement -> {
             val parent = callElement.parent
-            val receiver = if (parent is KtDotQualifiedExpression && parent.selectorExpression == callElement) {
+            val receiver = if (parent is KtQualifiedExpression && parent.selectorExpression == callElement) {
                 parent.receiverExpression
             } else null
-            Pair(callElement.resolveCall(), receiver)
+            callElement.collectCallCandidates() to receiver
         }
-        is KtArrayAccessExpression -> Pair(callElement.resolveCall(), callElement.arrayExpression)
+        is KtArrayAccessExpression -> callElement.collectCallCandidates() to callElement.arrayExpression
         else -> return emptyList()
     }
 
+    if (candidates.isEmpty()) return emptyList()
     val fileSymbol = callElement.containingKtFile.getFileSymbol()
-    return resolvedCall.calls.filterIsInstance<KtFunctionCall<*>>()
-        .filter { filterCandidate(it.symbol, callElement, fileSymbol, receiver) }
-        .map {
-            CandidateWithMapping(
-                it.partiallyAppliedSymbol.signature,
-                it.argumentMapping,
-            )
-        }
+
+    return candidates.filter {
+        filterCandidate(it, callElement, fileSymbol, receiver)
+    }.map {
+        val functionCall = it.candidate as KtFunctionCall<*>
+        CandidateWithMapping(
+            functionCall.partiallyAppliedSymbol.signature,
+            functionCall.argumentMapping,
+            isApplicableBestCandidate = it is KtApplicableCallCandidateInfo && it.isInBestCandidates
+        )
+    }
+}
+
+private fun KtAnalysisSession.filterCandidate(
+    candidateInfo: KtCallCandidateInfo,
+    callElement: KtElement,
+    fileSymbol: KtFileSymbol,
+    receiver: KtExpression?
+): Boolean {
+    val candidateCall = candidateInfo.candidate
+    if (candidateCall !is KtFunctionCall<*>) return false
+    val candidateSymbol = candidateCall.partiallyAppliedSymbol.signature.symbol
+    return filterCandidate(candidateSymbol, callElement, fileSymbol, receiver)
 }
 
 internal fun KtAnalysisSession.filterCandidate(
@@ -54,8 +66,20 @@ internal fun KtAnalysisSession.filterCandidate(
     }
 
     if (receiver != null && candidateSymbol is KtCallableSymbol) {
-        // Filter out candidates with wrong receiver
-        val receiverType = receiver.getKtType() ?: error("Receiver should have a KtType")
+        // We want only the candidates that match the receiver type. E.g., if you have code like this:
+        // ```
+        // fun String.foo() {}
+        // fun Int.foo() {}
+        // fun call(i: Int?) {
+        //   <expr>i?.foo()</expr>
+        // }
+        // ```
+        // The available candidates are `String.foo()` and `Int.foo()`. When checking the receiver types for safe calls, we want to compare
+        // the non-nullable receiver type against the candidate receiver type. E.g., that `Int` (and not the type of `i` which is `Int?`)
+        // is subtype of `Int` (the candidate receiver type).
+        val isSafeCall = receiver.parent is KtSafeQualifiedExpression
+        val receiverType = receiver.getKtType()?.let { if (isSafeCall) it.withNullability(KtTypeNullability.NON_NULLABLE) else it }
+            ?: error("Receiver should have a KtType")
         val candidateReceiverType = candidateSymbol.receiverType
         if (candidateReceiverType != null && receiverType.isNotSubTypeOf(candidateReceiverType)) return false
     }
@@ -69,4 +93,5 @@ internal fun KtAnalysisSession.filterCandidate(
 internal data class CandidateWithMapping(
     val candidate: KtFunctionLikeSignature<KtFunctionLikeSymbol>,
     val argumentMapping: LinkedHashMap<KtExpression, KtVariableLikeSignature<KtValueParameterSymbol>>,
+    val isApplicableBestCandidate: Boolean,
 )
\ No newline at end of file
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/quickfix/fixes/SpecifySuperTypeFixFactory.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/quickfix/fixes/SpecifySuperTypeFixFactory.kt
index 380f8c484b88..caa7ec11a4d2 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/quickfix/fixes/SpecifySuperTypeFixFactory.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/quickfix/fixes/SpecifySuperTypeFixFactory.kt
@@ -32,7 +32,7 @@ object SpecifySuperTypeFixFactory {
     class Input(val superTypes: List<TypeStringWithoutArgs>) : HLApplicatorInput
 
     val applicator = applicator<KtSuperExpression, Input> {
-        familyAndActionName(KotlinBundle.lazyMessage("specify.super.type"))
+        familyAndActionName(KotlinBundle.lazyMessage("intention.name.specify.supertype"))
         applyToWithEditorRequired { psi, input, project, editor ->
             when (input.superTypes.size) {
                 0 -> return@applyToWithEditorRequired
@@ -46,7 +46,7 @@ object SpecifySuperTypeFixFactory {
     }
 
     private fun KtSuperExpression.specifySuperType(superType: TypeStringWithoutArgs) {
-        project.executeWriteCommand(KotlinBundle.getMessage("specify.super.type")) {
+        project.executeWriteCommand(KotlinBundle.message("intention.name.specify.supertype")) {
             val label = this.labelQualifier?.text ?: ""
             val replaced =
                 replace(KtPsiFactory(this).createExpression("super<${superType.longTypeRepresentation}>$label")) as KtSuperExpression
@@ -55,7 +55,7 @@ object SpecifySuperTypeFixFactory {
     }
 
     private fun createListPopupStep(superExpression: KtSuperExpression, superTypes: List<TypeStringWithoutArgs>): ListPopupStep<*> {
-        return object : BaseListPopupStep<TypeStringWithoutArgs>(KotlinBundle.getMessage("choose.super.type"), superTypes) {
+        return object : BaseListPopupStep<TypeStringWithoutArgs>(KotlinBundle.getMessage("popup.title.choose.supertype"), superTypes) {
             override fun isAutoSelectionEnabled() = false
 
             override fun onChosen(selectedValue: TypeStringWithoutArgs, finalChoice: Boolean): PopupStep<*>? {
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportFirImpl.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportFirImpl.kt
index 26a162e2a8c3..696c6b80ee38 100644
--- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportFirImpl.kt
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportFirImpl.kt
@@ -11,27 +11,30 @@ import com.intellij.psi.search.SearchScope
 import com.intellij.psi.search.searches.DefinitionsScopedSearch
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import com.intellij.util.Processor
-import org.jetbrains.kotlin.asJava.classes.KtFakeLightMethod
-import org.jetbrains.kotlin.asJava.unwrapped
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.idea.core.isInheritable
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.analyse
 import org.jetbrains.kotlin.analysis.api.analyseWithReadAction
+import org.jetbrains.kotlin.analysis.api.calls.KtDelegatedConstructorCall
+import org.jetbrains.kotlin.analysis.api.calls.symbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithModality
 import org.jetbrains.kotlin.analysis.api.tokens.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.analysis.api.tokens.hackyAllowRunningOnEdt
+import org.jetbrains.kotlin.asJava.classes.KtFakeLightMethod
+import org.jetbrains.kotlin.asJava.unwrapped
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.idea.core.isInheritable
 import org.jetbrains.kotlin.idea.search.declarationsSearch.toPossiblyFakeLightMethods
-import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.search.usagesSearch.getDefaultImports
 import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
+import org.jetbrains.kotlin.idea.util.withResolvedCall
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.resolve.ImportPath
 
 class KotlinSearchUsagesSupportFirImpl : KotlinSearchUsagesSupport {
@@ -51,13 +54,6 @@ class KotlinSearchUsagesSupportFirImpl : KotlinSearchUsagesSupport {
         return false
     }
 
-    override fun <T : PsiNamedElement> filterDataClassComponentsIfDisabled(
-        elements: List<T>,
-        kotlinOptions: KotlinReferencesSearchOptions
-    ): List<T> {
-        return emptyList()
-    }
-
     override fun isCallableOverrideUsage(reference: PsiReference, declaration: KtNamedDeclaration): Boolean {
         return false
     }
@@ -242,10 +238,15 @@ class KotlinSearchUsagesSupportFirImpl : KotlinSearchUsagesSupport {
     }
 
     override fun createConstructorHandle(ktDeclaration: KtDeclaration): KotlinSearchUsagesSupport.ConstructorCallHandle {
-        //TODO FIR: This is the stub. Need to implement
         return object : KotlinSearchUsagesSupport.ConstructorCallHandle {
             override fun referencedTo(element: KtElement): Boolean {
-                return false
+                val callExpression = element.getNonStrictParentOfType<KtCallElement>() ?: return false
+                return withResolvedCall(callExpression) { call ->
+                    when (call) {
+                        is KtDelegatedConstructorCall -> call.symbol == ktDeclaration.getSymbol()
+                        else -> false
+                    }
+                } ?: false
             }
         }
     }
@@ -258,4 +259,4 @@ class KotlinSearchUsagesSupportFirImpl : KotlinSearchUsagesSupport {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FirKotlinTargetElementEvaluator.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FirKotlinTargetElementEvaluator.kt
new file mode 100644
index 000000000000..8d4a9d4e13de
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FirKotlinTargetElementEvaluator.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.search.ideaExtensions
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReference
+
+class FirKotlinTargetElementEvaluator : KotlinTargetElementEvaluator() {
+    override fun findLambdaOpenLBraceForGeneratedIt(ref: PsiReference): PsiElement? {
+        // TODO: implement
+        return null
+    }
+
+    override fun findReceiverForThisInExtensionFunction(ref: PsiReference): PsiElement? {
+        // TODO: implement
+        return null
+    }
+}
diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/util/findUsagesUtils.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/util/findUsagesUtils.kt
new file mode 100644
index 000000000000..df59b5bed1a4
--- /dev/null
+++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/util/findUsagesUtils.kt
@@ -0,0 +1,14 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.util
+
+import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
+import org.jetbrains.kotlin.analysis.api.analyseWithReadAction
+import org.jetbrains.kotlin.analysis.api.calls.KtCall
+import org.jetbrains.kotlin.analysis.api.calls.calls
+import org.jetbrains.kotlin.psi.KtElement
+
+inline fun <R> withResolvedCall(element: KtElement, crossinline block: KtAnalysisSession.(KtCall) -> R): R? {
+    return analyseWithReadAction(element) {
+        element.resolveCall()?.calls?.singleOrNull()?.let { block(it) }
+    }
+}
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java
deleted file mode 100644
index c9f132352172..000000000000
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirClassLoadingTestGenerated.java
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.fir.asJava.classes;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-import static org.jetbrains.kotlin.idea.artifacts.AdditionalKotlinArtifacts.compilerTestData;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("fir")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/ultraLightClasses")
-public class FirClassLoadingTestGenerated extends AbstractFirClassLoadingTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @Override
-    protected void setUp() {
-        compilerTestData("compiler/testData/asJava/ultraLightClasses");
-        super.setUp();
-    }
-
-    @TestMetadata("annotationTargets_1_6.kt")
-    public void testAnnotationTargets_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/annotationTargets_1_6.kt"));
-    }
-
-    @TestMetadata("annotationWithSetParamPropertyModifier.kt")
-    public void testAnnotationWithSetParamPropertyModifier() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt"));
-    }
-
-    @TestMetadata("annotations.kt")
-    public void testAnnotations() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/annotations.kt"));
-    }
-
-    @TestMetadata("classModifiers.kt")
-    public void testClassModifiers() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/classModifiers.kt"));
-    }
-
-    @TestMetadata("constructors.kt")
-    public void testConstructors() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/constructors.kt"));
-    }
-
-    @TestMetadata("coroutines.kt")
-    public void testCoroutines() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/coroutines.kt"));
-    }
-
-    @TestMetadata("dataClasses.kt")
-    public void testDataClasses() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/dataClasses.kt"));
-    }
-
-    @TestMetadata("defaultMethodInKotlinWithSettingAll.kt")
-    public void testDefaultMethodInKotlinWithSettingAll() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAll.kt"));
-    }
-
-    @TestMetadata("defaultMethodInKotlinWithSettingAllCompatibility.kt")
-    public void testDefaultMethodInKotlinWithSettingAllCompatibility() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/defaultMethodInKotlinWithSettingAllCompatibility.kt"));
-    }
-
-    @TestMetadata("delegatesWithAnnotations.kt")
-    public void testDelegatesWithAnnotations() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.kt"));
-    }
-
-    @TestMetadata("delegatingToInterfaces.kt")
-    public void testDelegatingToInterfaces() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/delegatingToInterfaces.kt"));
-    }
-
-    @TestMetadata("dollarsInNameLocal.kt")
-    public void testDollarsInNameLocal() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.kt"));
-    }
-
-    @TestMetadata("enums.kt")
-    public void testEnums() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/enums.kt"));
-    }
-
-    @TestMetadata("generics.kt")
-    public void testGenerics() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/generics.kt"));
-    }
-
-    @TestMetadata("implementingKotlinCollections.kt")
-    public void testImplementingKotlinCollections() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/implementingKotlinCollections.kt"));
-    }
-
-    @TestMetadata("importAliases.kt")
-    public void testImportAliases() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/importAliases.kt"));
-    }
-
-    @TestMetadata("inferringAnonymousObjectTypes.kt")
-    public void testInferringAnonymousObjectTypes() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.kt"));
-    }
-
-    @TestMetadata("inheritance.kt")
-    public void testInheritance() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/inheritance.kt"));
-    }
-
-    @TestMetadata("inlineClasses.kt")
-    public void testInlineClasses() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/inlineClasses.kt"));
-    }
-
-    @TestMetadata("inlineOnly.kt")
-    public void testInlineOnly() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/inlineOnly.kt"));
-    }
-
-    @TestMetadata("inlineReified.kt")
-    public void testInlineReified() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/inlineReified.kt"));
-    }
-
-    @TestMetadata("jvmField.kt")
-    public void testJvmField() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmField.kt"));
-    }
-
-    @TestMetadata("jvmName.kt")
-    public void testJvmName() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmName.kt"));
-    }
-
-    @TestMetadata("jvmOverloads.kt")
-    public void testJvmOverloads() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmOverloads.kt"));
-    }
-
-    @TestMetadata("jvmRecord.kt")
-    public void testJvmRecord() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmRecord.kt"));
-    }
-
-    @TestMetadata("jvmSynthetic.kt")
-    public void testJvmSynthetic() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmSynthetic.kt"));
-    }
-
-    @TestMetadata("jvmSyntheticForAccessors.kt")
-    public void testJvmSyntheticForAccessors() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.kt"));
-    }
-
-    @TestMetadata("jvmWildcardAnnotations.kt")
-    public void testJvmWildcardAnnotations() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/jvmWildcardAnnotations.kt"));
-    }
-
-    @TestMetadata("lateinitProperty.kt")
-    public void testLateinitProperty() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/lateinitProperty.kt"));
-    }
-
-    @TestMetadata("localClassDerived.kt")
-    public void testLocalClassDerived() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/localClassDerived.kt"));
-    }
-
-    @TestMetadata("objects.kt")
-    public void testObjects() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/objects.kt"));
-    }
-
-    @TestMetadata("properties.kt")
-    public void testProperties() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/properties.kt"));
-    }
-
-    @TestMetadata("simpleFunctions.kt")
-    public void testSimpleFunctions() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/simpleFunctions.kt"));
-    }
-
-    @TestMetadata("throwsAnnotation.kt")
-    public void testThrowsAnnotation() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/throwsAnnotation.kt"));
-    }
-
-    @TestMetadata("typeAliases.kt")
-    public void testTypeAliases() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/typeAliases.kt"));
-    }
-
-    @TestMetadata("typeAnnotations.kt")
-    public void testTypeAnnotations() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/typeAnnotations.kt"));
-    }
-
-    @TestMetadata("wildcardOptimization.kt")
-    public void testWildcardOptimization() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/wildcardOptimization.kt"));
-    }
-}
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java
deleted file mode 100644
index 75d206f7cbb8..000000000000
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightClassTestGenerated.java
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.fir.asJava.classes;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-import static org.jetbrains.kotlin.idea.artifacts.AdditionalKotlinArtifacts.compilerTestData;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("fir")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses")
-public class FirLightClassTestGenerated extends AbstractFirLightClassTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @Override
-    protected void setUp() {
-        compilerTestData("compiler/testData/asJava/lightClasses");
-        super.setUp();
-    }
-
-    @TestMetadata("AnnotatedParameterInEnumConstructor.kt")
-    public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.kt"));
-    }
-
-    @TestMetadata("AnnotatedParameterInInnerClassConstructor.kt")
-    public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.kt"));
-    }
-
-    @TestMetadata("AnnotatedPropertyWithSites.kt")
-    public void testAnnotatedPropertyWithSites() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt"));
-    }
-
-    @TestMetadata("AnnotationClass.kt")
-    public void testAnnotationClass() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotationClass.kt"));
-    }
-
-    @TestMetadata("AnnotationJvmRepeatable.kt")
-    public void testAnnotationJvmRepeatable() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotationJvmRepeatable.kt"));
-    }
-
-    @TestMetadata("AnnotationKotlinAndJavaRepeatable.kt")
-    public void testAnnotationKotlinAndJavaRepeatable() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJavaRepeatable.kt"));
-    }
-
-    @TestMetadata("AnnotationKotlinAndJvmRepeatable.kt")
-    public void testAnnotationKotlinAndJvmRepeatable() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotationKotlinAndJvmRepeatable.kt"));
-    }
-
-    @TestMetadata("AnnotationRepeatable.kt")
-    public void testAnnotationRepeatable() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt"));
-    }
-
-    @TestMetadata("Constructors.kt")
-    public void testConstructors() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/Constructors.kt"));
-    }
-
-    @TestMetadata("DataClassWithCustomImplementedMembers.kt")
-    public void testDataClassWithCustomImplementedMembers() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt"));
-    }
-
-    @TestMetadata("DelegatedNested.kt")
-    public void testDelegatedNested() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DelegatedNested.kt"));
-    }
-
-    @TestMetadata("Delegation.kt")
-    public void testDelegation() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/Delegation.kt"));
-    }
-
-    @TestMetadata("DeprecatedEnumEntry.kt")
-    public void testDeprecatedEnumEntry() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.kt"));
-    }
-
-    @TestMetadata("DeprecatedNotHiddenInClass.kt")
-    public void testDeprecatedNotHiddenInClass() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.kt"));
-    }
-
-    @TestMetadata("DollarsInName.kt")
-    public void testDollarsInName() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DollarsInName.kt"));
-    }
-
-    @TestMetadata("DollarsInNameNoPackage.kt")
-    public void testDollarsInNameNoPackage() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.kt"));
-    }
-
-    @TestMetadata("ExtendingInterfaceWithDefaultImpls.kt")
-    public void testExtendingInterfaceWithDefaultImpls() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt"));
-    }
-
-    @TestMetadata("HiddenDeprecated.kt")
-    public void testHiddenDeprecated() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/HiddenDeprecated.kt"));
-    }
-
-    @TestMetadata("HiddenDeprecatedInClass.kt")
-    public void testHiddenDeprecatedInClass() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt"));
-    }
-
-    @TestMetadata("InheritingInterfaceDefaultImpls.kt")
-    public void testInheritingInterfaceDefaultImpls() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.kt"));
-    }
-
-    @TestMetadata("InlineReified.kt")
-    public void testInlineReified() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/InlineReified.kt"));
-    }
-
-    @TestMetadata("JvmNameOnMember.kt")
-    public void testJvmNameOnMember() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/JvmNameOnMember.kt"));
-    }
-
-    @TestMetadata("JvmStatic.kt")
-    public void testJvmStatic() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/JvmStatic.kt"));
-    }
-
-    @TestMetadata("LocalFunctions.kt")
-    public void testLocalFunctions() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/LocalFunctions.kt"));
-    }
-
-    @TestMetadata("NestedObjects.kt")
-    public void testNestedObjects() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/NestedObjects.kt"));
-    }
-
-    @TestMetadata("NonDataClassWithComponentFunctions.kt")
-    public void testNonDataClassWithComponentFunctions() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.kt"));
-    }
-
-    @TestMetadata("OnlySecondaryConstructors.kt")
-    public void testOnlySecondaryConstructors() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt"));
-    }
-
-    @TestMetadata("PublishedApi.kt")
-    public void testPublishedApi() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/PublishedApi.kt"));
-    }
-
-    @TestMetadata("SpecialAnnotationsOnAnnotationClass.kt")
-    public void testSpecialAnnotationsOnAnnotationClass() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt"));
-    }
-
-    @TestMetadata("SpecialAnnotationsOnAnnotationClass_1_6.kt")
-    public void testSpecialAnnotationsOnAnnotationClass_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt"));
-    }
-
-    @TestMetadata("StubOrderForOverloads.kt")
-    public void testStubOrderForOverloads() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt"));
-    }
-
-    @TestMetadata("TypePararametersInClass.kt")
-    public void testTypePararametersInClass() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/TypePararametersInClass.kt"));
-    }
-
-    @TestMetadata("VarArgs.kt")
-    public void testVarArgs() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/VarArgs.kt"));
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/compilationErrors")
-    public static class CompilationErrors extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors");
-            super.setUp();
-        }
-
-        @TestMetadata("ActualClass.kt")
-        public void testActualClass() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.kt"));
-        }
-
-        @TestMetadata("ActualTypeAlias.kt")
-        public void testActualTypeAlias() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.kt"));
-        }
-
-        @TestMetadata("ActualTypeAliasCustomJvmPackageName.kt")
-        public void testActualTypeAliasCustomJvmPackageName() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt"));
-        }
-
-        @TestMetadata("AllInlineOnly.kt")
-        public void testAllInlineOnly() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt"));
-        }
-
-        @TestMetadata("AnnotationModifiers.kt")
-        public void testAnnotationModifiers() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.kt"));
-        }
-
-        @TestMetadata("EnumNameOverride.kt")
-        public void testEnumNameOverride() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.kt"));
-        }
-
-        @TestMetadata("ExpectClass.kt")
-        public void testExpectClass() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.kt"));
-        }
-
-        @TestMetadata("ExpectObject.kt")
-        public void testExpectObject() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.kt"));
-        }
-
-        @TestMetadata("ExpectedNestedClass.kt")
-        public void testExpectedNestedClass() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.kt"));
-        }
-
-        @TestMetadata("ExpectedNestedClassInObject.kt")
-        public void testExpectedNestedClassInObject() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.kt"));
-        }
-
-        @TestMetadata("JvmPackageName.kt")
-        public void testJvmPackageName() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt"));
-        }
-
-        @TestMetadata("LocalInAnnotation.kt")
-        public void testLocalInAnnotation() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/LocalInAnnotation.kt"));
-        }
-
-        @TestMetadata("PrivateInTrait.kt")
-        public void testPrivateInTrait() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.kt"));
-        }
-
-        @TestMetadata("RepetableAnnotations.kt")
-        public void testRepetableAnnotations() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt"));
-        }
-
-        @TestMetadata("SameName.kt")
-        public void testSameName() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/SameName.kt"));
-        }
-
-        @TestMetadata("TopLevelDestructuring.kt")
-        public void testTopLevelDestructuring() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.kt"));
-        }
-
-        @TestMetadata("TraitClassObjectField.kt")
-        public void testTraitClassObjectField() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.kt"));
-        }
-
-        @TestMetadata("TwoOverrides.kt")
-        public void testTwoOverrides() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.kt"));
-        }
-
-        @TestMetadata("WrongAnnotations.kt")
-        public void testWrongAnnotations() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt"));
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/facades")
-    public static class Facades extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/facades");
-            super.setUp();
-        }
-
-        @TestMetadata("AllPrivate.kt")
-        public void testAllPrivate() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/facades/AllPrivate.kt"));
-        }
-
-        @TestMetadata("MultiFile.kt")
-        public void testMultiFile() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/facades/MultiFile.kt"));
-        }
-
-        @TestMetadata("SingleFile.kt")
-        public void testSingleFile() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/facades/SingleFile.kt"));
-        }
-
-        @TestMetadata("SingleJvmClassName.kt")
-        public void testSingleJvmClassName() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt"));
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/ideRegression")
-    public static class IdeRegression extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/ideRegression");
-            super.setUp();
-        }
-
-        @TestMetadata("AllOpenAnnotatedClasses.kt")
-        public void testAllOpenAnnotatedClasses() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt"));
-        }
-
-        @TestMetadata("ImplementingCharSequenceAndNumber.kt")
-        public void testImplementingCharSequenceAndNumber() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.kt"));
-        }
-
-        @TestMetadata("ImplementingMap.kt")
-        public void testImplementingMap() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.kt"));
-        }
-
-        @TestMetadata("ImplementingMutableSet.kt")
-        public void testImplementingMutableSet() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.kt"));
-        }
-
-        @TestMetadata("InheritingInterfaceDefaultImpls.kt")
-        public void testInheritingInterfaceDefaultImpls() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.kt"));
-        }
-
-        @TestMetadata("OverridingFinalInternal.kt")
-        public void testOverridingFinalInternal() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt"));
-        }
-
-        @TestMetadata("OverridingInternal.kt")
-        public void testOverridingInternal() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt"));
-        }
-
-        @TestMetadata("OverridingProtected.kt")
-        public void testOverridingProtected() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt"));
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/nullabilityAnnotations")
-    public static class NullabilityAnnotations extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations");
-            super.setUp();
-        }
-
-        @TestMetadata("Class.kt")
-        public void testClass() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt"));
-        }
-
-        @TestMetadata("ClassObjectField.kt")
-        public void testClassObjectField() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt"));
-        }
-
-        @TestMetadata("ClassWithConstructor.kt")
-        public void testClassWithConstructor() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt"));
-        }
-
-        @TestMetadata("ClassWithConstructorAndProperties.kt")
-        public void testClassWithConstructorAndProperties() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt"));
-        }
-
-        @TestMetadata("FileFacade.kt")
-        public void testFileFacade() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.kt"));
-        }
-
-        @TestMetadata("Generic.kt")
-        public void testGeneric() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt"));
-        }
-
-        @TestMetadata("IntOverridesAny.kt")
-        public void testIntOverridesAny() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt"));
-        }
-
-        @TestMetadata("JvmOverloads.kt")
-        public void testJvmOverloads() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt"));
-        }
-
-        @TestMetadata("NullableUnitReturn.kt")
-        public void testNullableUnitReturn() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt"));
-        }
-
-        @TestMetadata("OverrideAnyWithUnit.kt")
-        public void testOverrideAnyWithUnit() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt"));
-        }
-
-        @TestMetadata("PlatformTypes.kt")
-        public void testPlatformTypes() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.kt"));
-        }
-
-        @TestMetadata("Primitives.kt")
-        public void testPrimitives() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt"));
-        }
-
-        @TestMetadata("PrivateInClass.kt")
-        public void testPrivateInClass() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt"));
-        }
-
-        @TestMetadata("Synthetic.kt")
-        public void testSynthetic() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt"));
-        }
-
-        @TestMetadata("Trait.kt")
-        public void testTrait() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt"));
-        }
-
-        @TestMetadata("UnitAsGenericArgument.kt")
-        public void testUnitAsGenericArgument() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt"));
-        }
-
-        @TestMetadata("UnitParameter.kt")
-        public void testUnitParameter() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt"));
-        }
-
-        @TestMetadata("VoidReturn.kt")
-        public void testVoidReturn() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt"));
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/object")
-    public static class Object extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/object");
-            super.setUp();
-        }
-
-        @TestMetadata("SimpleObject.kt")
-        public void testSimpleObject() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/object/SimpleObject.kt"));
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/lightClasses/publicField")
-    public static class PublicField extends AbstractFirLightClassTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @Override
-        protected void setUp() {
-            compilerTestData("compiler/testData/asJava/lightClasses/publicField");
-            super.setUp();
-        }
-
-        @TestMetadata("CompanionObject.kt")
-        public void testCompanionObject() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/publicField/CompanionObject.kt"));
-        }
-
-        @TestMetadata("Simple.kt")
-        public void testSimple() throws Exception {
-            runTest(compilerTestData("compiler/testData/asJava/lightClasses/publicField/Simple.kt"));
-        }
-    }
-}
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java
deleted file mode 100644
index 20ee991a68c9..000000000000
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/asJava/classes/FirLightFacadeClassTestGenerated.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.fir.asJava.classes;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-import static org.jetbrains.kotlin.idea.artifacts.AdditionalKotlinArtifacts.compilerTestData;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("fir")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("../../../out/kotlinc-testdata/testData/compiler/testData/asJava/ultraLightFacades")
-public class FirLightFacadeClassTestGenerated extends AbstractFirLightFacadeClassTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @Override
-    protected void setUp() {
-        compilerTestData("compiler/testData/asJava/ultraLightFacades");
-        super.setUp();
-    }
-
-    @TestMetadata("coroutines.kt")
-    public void testCoroutines() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/coroutines.kt"));
-    }
-
-    @TestMetadata("importAliases.kt")
-    public void testImportAliases() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/importAliases.kt"));
-    }
-
-    @TestMetadata("inlineOnly.kt")
-    public void testInlineOnly() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/inlineOnly.kt"));
-    }
-
-    @TestMetadata("jvmField.kt")
-    public void testJvmField() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/jvmField.kt"));
-    }
-
-    @TestMetadata("jvmName.kt")
-    public void testJvmName() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/jvmName.kt"));
-    }
-
-    @TestMetadata("jvmWildcardAnnotations.kt")
-    public void testJvmWildcardAnnotations() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/jvmWildcardAnnotations.kt"));
-    }
-
-    @TestMetadata("lateinitProperty.kt")
-    public void testLateinitProperty() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/lateinitProperty.kt"));
-    }
-
-    @TestMetadata("multifileFacade.kt")
-    public void testMultifileFacade() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/multifileFacade.kt"));
-    }
-
-    @TestMetadata("multifileFacadeJvmName.kt")
-    public void testMultifileFacadeJvmName() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/multifileFacadeJvmName.kt"));
-    }
-
-    @TestMetadata("properties.kt")
-    public void testProperties() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/properties.kt"));
-    }
-
-    @TestMetadata("simpleFunctions.kt")
-    public void testSimpleFunctions() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/simpleFunctions.kt"));
-    }
-
-    @TestMetadata("throwsAnnotation.kt")
-    public void testThrowsAnnotation() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/throwsAnnotation.kt"));
-    }
-
-    @TestMetadata("wildcardOptimization.kt")
-    public void testWildcardOptimization() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightFacades/wildcardOptimization.kt"));
-    }
-}
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/handlers/HLGotoSuperActionHandlerTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/handlers/HLGotoSuperActionHandlerTestGenerated.java
index e8c4ba269af8..151dfa596592 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/handlers/HLGotoSuperActionHandlerTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/codeInsight/handlers/HLGotoSuperActionHandlerTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.codeInsight.handlers;
 
@@ -9,8 +9,8 @@ import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.idea.test.TestRoot;
 import org.junit.runner.RunWith;
 
-/*
- * This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}.
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
  * DO NOT MODIFY MANUALLY.
  */
 @SuppressWarnings("all")
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java
index a59b3fa76cf8..85697fb8d7d7 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/FirKeywordCompletionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion;
 
@@ -110,11 +110,21 @@ public abstract class FirKeywordCompletionTestGenerated extends AbstractFirKeywo
             runTest("../completion/tests/testData/keywords/BreakContinue.kt");
         }
 
+        @TestMetadata("BreakPrefixMatching.kt")
+        public void testBreakPrefixMatching() throws Exception {
+            runTest("../completion/tests/testData/keywords/BreakPrefixMatching.kt");
+        }
+
         @TestMetadata("BreakWithLabel.kt")
         public void testBreakWithLabel() throws Exception {
             runTest("../completion/tests/testData/keywords/BreakWithLabel.kt");
         }
 
+        @TestMetadata("BreakWithLabelPrefix.kt")
+        public void testBreakWithLabelPrefix() throws Exception {
+            runTest("../completion/tests/testData/keywords/BreakWithLabelPrefix.kt");
+        }
+
         @TestMetadata("CommaExpected.kt")
         public void testCommaExpected() throws Exception {
             runTest("../completion/tests/testData/keywords/CommaExpected.kt");
@@ -125,11 +135,21 @@ public abstract class FirKeywordCompletionTestGenerated extends AbstractFirKeywo
             runTest("../completion/tests/testData/keywords/CompanionObjectBeforeObject.kt");
         }
 
+        @TestMetadata("ContinuePrefixMatching.kt")
+        public void testContinuePrefixMatching() throws Exception {
+            runTest("../completion/tests/testData/keywords/ContinuePrefixMatching.kt");
+        }
+
         @TestMetadata("ContinueWithLabel.kt")
         public void testContinueWithLabel() throws Exception {
             runTest("../completion/tests/testData/keywords/ContinueWithLabel.kt");
         }
 
+        @TestMetadata("ContinueWithLabelPrefix.kt")
+        public void testContinueWithLabelPrefix() throws Exception {
+            runTest("../completion/tests/testData/keywords/ContinueWithLabelPrefix.kt");
+        }
+
         @TestMetadata("Else1.kt")
         public void testElse1() throws Exception {
             runTest("../completion/tests/testData/keywords/Else1.kt");
@@ -465,9 +485,14 @@ public abstract class FirKeywordCompletionTestGenerated extends AbstractFirKeywo
             runTest("../completion/tests/testData/keywords/Return5.kt");
         }
 
-        @TestMetadata("Return6.kt")
-        public void testReturn6() throws Exception {
-            runTest("../completion/tests/testData/keywords/Return6.kt");
+        @TestMetadata("Return6_1.kt")
+        public void testReturn6_1() throws Exception {
+            runTest("../completion/tests/testData/keywords/Return6_1.kt");
+        }
+
+        @TestMetadata("Return6_2.kt")
+        public void testReturn6_2() throws Exception {
+            runTest("../completion/tests/testData/keywords/Return6_2.kt");
         }
 
         @TestMetadata("Return7.kt")
@@ -525,6 +550,11 @@ public abstract class FirKeywordCompletionTestGenerated extends AbstractFirKeywo
             runTest("../completion/tests/testData/keywords/ReturnNullableBoolean.kt");
         }
 
+        @TestMetadata("ReturnPrefixMatching.kt")
+        public void testReturnPrefixMatching() throws Exception {
+            runTest("../completion/tests/testData/keywords/ReturnPrefixMatching.kt");
+        }
+
         @TestMetadata("ReturnSet.kt")
         public void testReturnSet() throws Exception {
             runTest("../completion/tests/testData/keywords/ReturnSet.kt");
@@ -610,6 +640,11 @@ public abstract class FirKeywordCompletionTestGenerated extends AbstractFirKeywo
             runTest("../completion/tests/testData/keywords/ThisInCompanion.kt");
         }
 
+        @TestMetadata("ThisLabelPrefix.kt")
+        public void testThisLabelPrefix() throws Exception {
+            runTest("../completion/tests/testData/keywords/ThisLabelPrefix.kt");
+        }
+
         @TestMetadata("ThisPrefixMatching.kt")
         public void testThisPrefixMatching() throws Exception {
             runTest("../completion/tests/testData/keywords/ThisPrefixMatching.kt");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java
index c7916a8bcdb8..bc9f20f8ee6e 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelJvmBasicCompletionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java
index 6fee133c9b73..ae2b68e5df5c 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/HighLevelMultiFileJvmBasicCompletionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion;
 
@@ -343,6 +343,16 @@ public class HighLevelMultiFileJvmBasicCompletionTestGenerated extends AbstractH
         runTest("../completion/tests/testData/basic/multifile/PropertyKeysWithPrefix/");
     }
 
+    @TestMetadata("StaticMembersOfImportedClassFromJava")
+    public void testStaticMembersOfImportedClassFromJava() throws Exception {
+        runTest("../completion/tests/testData/basic/multifile/StaticMembersOfImportedClassFromJava/");
+    }
+
+    @TestMetadata("StaticMembersOfImportedInterfaceFromJava")
+    public void testStaticMembersOfImportedInterfaceFromJava() throws Exception {
+        runTest("../completion/tests/testData/basic/multifile/StaticMembersOfImportedInterfaceFromJava/");
+    }
+
     @TestMetadata("StaticMembersOfNotImportedClassFromJava")
     public void testStaticMembersOfNotImportedClassFromJava() throws Exception {
         runTest("../completion/tests/testData/basic/multifile/StaticMembersOfNotImportedClassFromJava/");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java
index 78840c41f5e9..6d2b87545c9e 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/FirKeywordCompletionHandlerTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion.test.handlers;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java
index 7dc3e67c3cf1..2ca5550aa91e 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/test/handlers/HighLevelBasicCompletionHandlerTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion.test.handlers;
 
@@ -53,6 +53,11 @@ public class HighLevelBasicCompletionHandlerTestGenerated extends AbstractHighLe
         runTest("../completion/tests/testData/handlers/basic/ClassNameForMethodWithPackageConflict2.kt");
     }
 
+    @TestMetadata("ClassNameWithAliasConfict.kt")
+    public void testClassNameWithAliasConfict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/ClassNameWithAliasConfict.kt");
+    }
+
     @TestMetadata("ClassNameWithPackageConflict.kt")
     public void testClassNameWithPackageConflict() throws Exception {
         runTest("../completion/tests/testData/handlers/basic/ClassNameWithPackageConflict.kt");
@@ -118,6 +123,31 @@ public class HighLevelBasicCompletionHandlerTestGenerated extends AbstractHighLe
         runTest("../completion/tests/testData/handlers/basic/InterfaceNameBeforeRunBug.kt");
     }
 
+    @TestMetadata("JavaClassName.kt")
+    public void testJavaClassName() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/JavaClassName.kt");
+    }
+
+    @TestMetadata("JavaClassNameWithAliasConfict.kt")
+    public void testJavaClassNameWithAliasConfict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/JavaClassNameWithAliasConfict.kt");
+    }
+
+    @TestMetadata("JavaClassNameWithConflict.kt")
+    public void testJavaClassNameWithConflict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/JavaClassNameWithConflict.kt");
+    }
+
+    @TestMetadata("JavaClassNameWithConflict2.kt")
+    public void testJavaClassNameWithConflict2() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/JavaClassNameWithConflict2.kt");
+    }
+
+    @TestMetadata("JavaClassNameWithKotlinNestedClassConflict.kt")
+    public void testJavaClassNameWithKotlinNestedClassConflict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/JavaClassNameWithKotlinNestedClassConflict.kt");
+    }
+
     @TestMetadata("JavaSAM.kt")
     public void testJavaSAM() throws Exception {
         runTest("../completion/tests/testData/handlers/basic/JavaSAM.kt");
@@ -163,6 +193,11 @@ public class HighLevelBasicCompletionHandlerTestGenerated extends AbstractHighLe
         runTest("../completion/tests/testData/handlers/basic/LocalFunction.kt");
     }
 
+    @TestMetadata("NestedClassNameWithFileLevelConflict.kt")
+    public void testNestedClassNameWithFileLevelConflict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/NestedClassNameWithFileLevelConflict.kt");
+    }
+
     @TestMetadata("NestedTypeArg.kt")
     public void testNestedTypeArg() throws Exception {
         runTest("../completion/tests/testData/handlers/basic/NestedTypeArg.kt");
@@ -248,6 +283,26 @@ public class HighLevelBasicCompletionHandlerTestGenerated extends AbstractHighLe
         runTest("../completion/tests/testData/handlers/basic/SyntheticExtension.kt");
     }
 
+    @TestMetadata("TypeAliasConfict.kt")
+    public void testTypeAliasConfict() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/TypeAliasConfict.kt");
+    }
+
+    @TestMetadata("TypeAliasConfict1.kt")
+    public void testTypeAliasConfict1() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/TypeAliasConfict1.kt");
+    }
+
+    @TestMetadata("TypeAliasConfict2.kt")
+    public void testTypeAliasConfict2() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/TypeAliasConfict2.kt");
+    }
+
+    @TestMetadata("TypeAliasConfict3.kt")
+    public void testTypeAliasConfict3() throws Exception {
+        runTest("../completion/tests/testData/handlers/basic/TypeAliasConfict3.kt");
+    }
+
     @TestMetadata("TypeInferedFromWrapperType.kt")
     public void testTypeInferedFromWrapperType() throws Exception {
         runTest("../completion/tests/testData/handlers/basic/TypeInferedFromWrapperType.kt");
@@ -771,6 +826,11 @@ public class HighLevelBasicCompletionHandlerTestGenerated extends AbstractHighLe
             runTest("../completion/tests/testData/handlers/basic/parameterNameAndType/TabReplace3.kt");
         }
 
+        @TestMetadata("TypeAlias.kt")
+        public void testTypeAlias() throws Exception {
+            runTest("../completion/tests/testData/handlers/basic/parameterNameAndType/TypeAlias.kt");
+        }
+
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
             runTest("../completion/tests/testData/handlers/basic/parameterNameAndType/TypeParameter.kt");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java
index 4aa064898e37..6953025600fe 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/completion/wheigher/HighLevelWeigherTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.completion.wheigher;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java
index 138bdd059990..3846ba8fa04c 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesFirTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt
index 5bd5438a34df..a20a5c550259 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesMultiModuleFirTest.kt
@@ -21,7 +21,7 @@ class FindUsagesMultiModuleFirTest : FindUsagesMultiModuleTest() {
 
     override fun doFindUsagesTest() {
         IgnoreTests.runTestIfEnabledByFileDirective(
-            Paths.get(mainFile.virtualFilePath),
+            getTestdataFile().toPath().resolve("directives.txt"),
             IgnoreTests.DIRECTIVES.FIR_COMPARISON,
             directivePosition = IgnoreTests.DirectivePosition.LAST_LINE_IN_FILE
         ) {
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java
index b3b26d7b76a0..77ad441ad95e 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/FindUsagesWithDisableComponentSearchFirTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java
index acd8214a0c72..828fe534a6c0 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithLibraryFirTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java
index 851860969405..643a97e47120 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/findUsages/KotlinFindUsagesWithStdlibFirTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.findUsages;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingMetaInfoTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingMetaInfoTestGenerated.java
index 642103eff585..b796413d43e9 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingMetaInfoTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/highlighter/FirHighlightingMetaInfoTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.highlighter;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java
index e36791cf5768..b3ed294e6530 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/imports/FirJvmOptimizeImportsTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.imports;
 
@@ -9,8 +9,8 @@ import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.idea.test.TestRoot;
 import org.junit.runner.RunWith;
 
-/*
- * This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}.
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
  * DO NOT MODIFY MANUALLY.
  */
 @SuppressWarnings("all")
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java
index fb85f7fcf344..3fc5de7f6f2c 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLInspectionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.inspections;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java
index aa015567112e..77614158ccc7 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.inspections;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java
index 9365de09bf6b..144d798d4ac1 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/intentions/HLIntentionTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.intentions;
 
@@ -742,6 +742,11 @@ public abstract class HLIntentionTestGenerated extends AbstractHLIntentionTest {
             runTest("../idea/tests/testData/intentions/specifyTypeExplicitly/stringRedefined.kt");
         }
 
+        @TestMetadata("typeAlias.kt")
+        public void testTypeAlias() throws Exception {
+            runTest("../idea/tests/testData/intentions/specifyTypeExplicitly/typeAlias.kt");
+        }
+
         @TestMetadata("typeAlreadyProvided.kt")
         public void testTypeAlreadyProvided() throws Exception {
             runTest("../idea/tests/testData/intentions/specifyTypeExplicitly/typeAlreadyProvided.kt");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/FirParameterInfoTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/FirParameterInfoTestGenerated.java
index fd8a30cb816f..8bcec512b82c 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/FirParameterInfoTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/parameterInfo/FirParameterInfoTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.parameterInfo;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
index 56be43e182dc..7d60439534ee 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/AbstractHighLevelQuickFixTest.kt
@@ -4,13 +4,23 @@ package org.jetbrains.kotlin.idea.fir.quickfix
 
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInspection.InspectionProfileEntry
+import org.jetbrains.kotlin.idea.fir.invalidateCaches
 import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest
+import org.jetbrains.kotlin.idea.test.disableKotlinOfficialCodeStyle
+import org.jetbrains.kotlin.idea.test.runAll
 import org.jetbrains.kotlin.test.utils.IgnoreTests
 import java.io.File
 import java.nio.file.Paths
-
+import com.intellij.util.ThrowableRunnable
 
 abstract class AbstractHighLevelQuickFixTest : AbstractQuickFixTest() {
+    override fun tearDown() {
+        runAll(
+            ThrowableRunnable { project.invalidateCaches() },
+            ThrowableRunnable { super.tearDown() },
+        )
+
+    }
     override fun doTest(beforeFileName: String) {
         val firBeforeFileName = getFirBeforeFileName(beforeFileName)
         IgnoreTests.runTestIfNotDisabledByFileDirective(
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
index 7cea3052cd84..171c99296ead 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixMultiFileTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.quickfix;
 
@@ -359,6 +359,34 @@ public class HighLevelQuickFixMultiFileTestGenerated extends AbstractHighLevelQu
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("../idea/tests/testData/quickfix/autoImports/invisible")
+    public static class Invisible extends AbstractHighLevelQuickFixMultiFileTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTestWithExtraFile, this, testDataFilePath);
+        }
+
+        @TestMetadata("annotation.before.Main.kt")
+        public void testAnnotation() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Main.kt");
+        }
+
+        @TestMetadata("class.before.Main.kt")
+        public void testClass() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/invisible/class.before.Main.kt");
+        }
+
+        @TestMetadata("fun.before.Main.kt")
+        public void testFun() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/invisible/fun.before.Main.kt");
+        }
+
+        @TestMetadata("property.before.Main.kt")
+        public void testProperty() throws Exception {
+            runTest("../idea/tests/testData/quickfix/autoImports/invisible/property.before.Main.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("../idea/tests/testData/quickfix/autoImports/mismatchingArgs")
     public static class MismatchingArgs extends AbstractHighLevelQuickFixMultiFileTest {
         private void runTest(String testDataFilePath) throws Exception {
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
index 295fc89b29d0..c6ce723266bc 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/quickfix/HighLevelQuickFixTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.quickfix;
 
@@ -2015,6 +2015,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
         }
 
+        @TestMetadata("addElseBranchBooleanWarning.kt")
+        public void testAddElseBranchBooleanWarning() throws Exception {
+            runTest("../idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt");
+        }
+
         @TestMetadata("addElseBranchEnumStatement.kt")
         public void testAddElseBranchEnumStatement() throws Exception {
             runTest("../idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt");
@@ -2025,6 +2030,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             runTest("../idea/tests/testData/quickfix/when/addElseBranchSealed.kt");
         }
 
+        @TestMetadata("addElseBranchSealedWarning.kt")
+        public void testAddElseBranchSealedWarning() throws Exception {
+            runTest("../idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt");
+        }
+
         @TestMetadata("addRemainingBranchesBlankLine.kt")
         public void testAddRemainingBranchesBlankLine() throws Exception {
             runTest("../idea/tests/testData/quickfix/when/addRemainingBranchesBlankLine.kt");
@@ -2110,6 +2120,11 @@ public abstract class HighLevelQuickFixTestGenerated extends AbstractHighLevelQu
             runTest("../idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt");
         }
 
+        @TestMetadata("addRemainingBranchesSealedWarning.kt")
+        public void testAddRemainingBranchesSealedWarning() throws Exception {
+            runTest("../idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt");
+        }
+
         @TestMetadata("breakInWhen.kt")
         public void testBreakInWhen() throws Exception {
             runTest("../idea/tests/testData/quickfix/when/breakInWhen.kt");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java
index cd78000d3550..84e60adc1c7c 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/resolve/FirReferenceResolveTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.resolve;
 
@@ -373,6 +373,16 @@ public class FirReferenceResolveTestGenerated extends AbstractFirReferenceResolv
         runTest("../idea/tests/testData/resolve/references/SeveralOverrides.kt");
     }
 
+    @TestMetadata("SuperTypePrimaryConstructor.kt")
+    public void testSuperTypePrimaryConstructor() throws Exception {
+        runTest("../idea/tests/testData/resolve/references/SuperTypePrimaryConstructor.kt");
+    }
+
+    @TestMetadata("SuperTypeSecondaryConstructor.kt")
+    public void testSuperTypeSecondaryConstructor() throws Exception {
+        runTest("../idea/tests/testData/resolve/references/SuperTypeSecondaryConstructor.kt");
+    }
+
     @TestMetadata("SyntheticProperty.kt")
     public void testSyntheticProperty() throws Exception {
         runTest("../idea/tests/testData/resolve/references/SyntheticProperty.kt");
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/search/HLImplementationSearcherTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/search/HLImplementationSearcherTestGenerated.java
index faeb7be41db4..4e56048e8fe7 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/search/HLImplementationSearcherTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/search/HLImplementationSearcherTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.search;
 
diff --git a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java
index b0a5bfeb8966..fb1d6774d972 100644
--- a/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java
+++ b/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/shortenRefs/FirShortenRefsTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.shortenRefs;
 
@@ -235,6 +235,11 @@ public abstract class FirShortenRefsTestGenerated extends AbstractFirShortenRefs
             runTest("../idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes.kt");
         }
 
+        @TestMetadata("ParameterTypeGenericTypes_missingTypeArgumentError.kt")
+        public void testParameterTypeGenericTypes_missingTypeArgumentError() throws Exception {
+            runTest("../idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt");
+        }
+
         @TestMetadata("ParameterTypeImplicitImportBeatsStarImport.kt")
         public void testParameterTypeImplicitImportBeatsStarImport() throws Exception {
             runTest("../idea/tests/testData/shortenRefsFir/types/ParameterTypeImplicitImportBeatsStarImport.kt");
diff --git a/plugins/kotlin/fir/testData/search/implementations/classes/classWithDeepHeiarchy.kt b/plugins/kotlin/fir/testData/search/implementations/classes/classWithDeepHeiarchy.kt
index 388923d301b5..3d179120dc88 100644
--- a/plugins/kotlin/fir/testData/search/implementations/classes/classWithDeepHeiarchy.kt
+++ b/plugins/kotlin/fir/testData/search/implementations/classes/classWithDeepHeiarchy.kt
@@ -1,4 +1,4 @@
-open class X<caret>()
+open class <caret>X()
 
 open class A : X()
 
diff --git a/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 8493b3ce2e91..2909ba246e86 100644
--- a/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/plugins/kotlin/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -284,6 +284,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             after(DOC_COMMENT).lineBreakInCode()
 
             // =============== Spacing ================
+            aroundInside(AND, INTERSECTION_TYPE).spacesNoLineBreak(1)
+
             between(EOL_COMMENT, COMMA).lineBreakInCode()
             before(COMMA).spacesNoLineBreak(if (kotlinCommonSettings.SPACE_BEFORE_COMMA) 1 else 0)
             after(COMMA).spaceIf(kotlinCommonSettings.SPACE_AFTER_COMMA)
diff --git a/plugins/kotlin/frontend-independent/resources-en/messages/KotlinBundle.properties b/plugins/kotlin/frontend-independent/resources-en/messages/KotlinBundle.properties
index e5cbfe7e1529..41a3c1095fcc 100644
--- a/plugins/kotlin/frontend-independent/resources-en/messages/KotlinBundle.properties
+++ b/plugins/kotlin/frontend-independent/resources-en/messages/KotlinBundle.properties
@@ -717,6 +717,9 @@ configuration.description.when.inlining.a.function.from.other.module.with.embedd
 configuration.error.text.shouldn.t.add.null.urls.to.custom.repositories=Shouldn't add null urls to custom repositories
 configuration.feature.text.new.experimental.project.wizard=New Experimental Project Wizard
 configuration.feature.text.new.java.to.kotlin.converter=New Java to Kotlin Converter
+configuration.maven.group.name=Kotlin Maven project import
+configuration.maven.jvm.target.1.6.title=Unsupported JVM target 1.6
+configuration.maven.jvm.target.1.6.content=Maven project uses JVM target 1.6 for Kotlin compilation, which is no longer supported. It has been imported as JVM target 1.8. Consider migrating the project to JVM 1.8.
 configuration.message.enter.fully.qualified.method.name=Enter fully-qualified method name:
 configuration.message.text.a.new.version.is.available=A new version {0} is available
 configuration.message.text.a.new.version.is.found=A new version {0} is found but it''s not verified by {1}.
@@ -730,6 +733,11 @@ configuration.migration.text.migrations.for.kotlin.code.are.available=Migrations
 configuration.migration.text.run.migrations=Run migrations
 configuration.migration.text.standard.library=Standard library: {0} -> {1}
 configuration.migration.title.kotlin.migration=Kotlin migration
+kotlin.eap.survey.notification.group.name=Kotlin EAP Survey
+kotlin.eap.survey.notification.title=Kotlin Early Access Program
+kotlin.eap.survey.notification.text=We want to know more about you and how we can make the EAP experience more convenient!
+kotlin.eap.survey.notification.action=Take EAP survey
+kotlin.eap.survey.notification.link=https://surveys.jetbrains.com/s3/kotlin-eaps-survey
 configuration.name.kotlin.compiler=Kotlin Compiler
 configuration.name.kotlin=Kotlin
 configuration.name.method=Method
@@ -2167,9 +2175,15 @@ inspection.obsolete.experimental.coroutines.display.name=Experimental coroutines
 inspection.obsolete.kotlin.js.packages.display.name='kotlin.browser' and 'kotlin.dom' packages are deprecated since 1.4
 inspection.warning.on.main.unused.parameter.migration.display.name=Unused `args` on `main` since 1.4
 inspection.prohibit.repeated.use.site.target.annotations.migration.display.name=Repeated annotation which is not marked as '@Repeatable'
+inspection.do.not.propagate.method.deprecation.through.overrides=Do not propagate method deprecation through overrides since 1.9
+inspection.this.class.does.not.have.a.constructor=Forbidden constructor call
 inspection.non.exhaustive.when.statement.migration.display.name=Non-exhaustive 'when' statements will be prohibited since 1.7
 inspection.prohibit.use.site.target.annotations.on.super.types.migration.display.name=Meaningless annotations targets on superclass
 inspection.redundant.label.migration.display.name=Redundant label
+inspection.ambiguous.expression.when.branch.migration.display.name=Ambiguous logical expressions in 'when' branches since 1.7
+inspection.add.conversion.call.display.name=Explicit conversion from `Int` needed since 1.9 
+inspection.deprecated.inline.classes.migration.display.name=Inline classes are deprecated since 1.5
+inspection.deprecated.inline.class.text=Deprecated inline class
 inspection.restrict.return.statement.target.migration.display.name=Target label does not denote a function since 1.4
 inspection.prohibit.jvm.overloads.on.constructors.of.annotation.classes.migration.display.name='@JvmOverloads' annotation cannot be used on constructors of annotation classes since 1.4
 inspection.prohibit.type.parameters.for.local.variables.migration.display.name=Local variable with type parameters
@@ -2352,6 +2366,8 @@ inspection.redundant.label.text=Redundant label
 intention.convert.lambda.line=Convert to {0,choice,0#single|1#multi}-line lambda
 intention.trailing.comma.custom.text={0,choice,0#Enable|1#Disable} a trailing comma by default in the formatter
 intention.trailing.comma.text=Enable/disable a trailing comma in the formatter
+intention.name.specify.supertype=Specify supertype
+popup.title.choose.supertype=Choose Supertype
 fix.remove.argument.text=Remove argument
 fix.remove.redundant.star.text=Remove redundant *
 refactoring.extract.to.separate.file.text=Extract to separate file
@@ -2586,4 +2602,6 @@ inspection.unnecessary.opt_in.annotation.display.name=Unnecessary '@OptIn' annot
 inspection.unnecessary.opt_in.redundant.marker=The opt-in marker is redundant: no experimental API marked with ''{0}'' is used
 inspection.unnecessary.opt_in.redundant.annotation=The opt-in annotation is redundant: no matching experimental API is used
 inspection.unnecessary.opt_in.remove.marker.fix.family.name=Remove opt-in marker
-inspection.unnecessary.opt_in.remove.annotation.fix.family.name=Remove annotation
\ No newline at end of file
+inspection.unnecessary.opt_in.remove.annotation.fix.family.name=Remove annotation
+
+wrap.expression.in.parentheses=Wrap expression in parentheses
\ No newline at end of file
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupport.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupport.kt
index f05150b9bd4d..2f456b737469 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupport.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupport.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.kotlin.idea.findUsages
 
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiConstructorCall
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
 import com.intellij.psi.search.GlobalSearchScope
@@ -12,6 +13,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.kotlin.psi.KtParameter
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 
 interface KotlinFindUsagesSupport {
 
@@ -33,8 +35,14 @@ interface KotlinFindUsagesSupport {
         fun tryRenderDeclarationCompactStyle(declaration: KtDeclaration): String? =
             getInstance(declaration.project).tryRenderDeclarationCompactStyle(declaration)
 
-        fun PsiReference.isConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean =
-            getInstance(ktClassOrObject.project).isConstructorUsage(this, ktClassOrObject)
+        fun PsiReference.isConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean {
+            fun isJavaConstructorUsage(): Boolean {
+                val call = element.getNonStrictParentOfType<PsiConstructorCall>()
+                return call == element.parent && call?.resolveConstructor()?.containingClass?.navigationElement == ktClassOrObject
+            }
+
+            return isJavaConstructorUsage() || getInstance(ktClassOrObject.project).isKotlinConstructorUsage(this, ktClassOrObject)
+        }
 
         fun getSuperMethods(declaration: KtDeclaration, ignore: Collection<PsiElement>?) : List<PsiElement> =
             getInstance(declaration.project).getSuperMethods(declaration, ignore)
@@ -51,9 +59,9 @@ interface KotlinFindUsagesSupport {
 
     fun tryRenderDeclarationCompactStyle(declaration: KtDeclaration): String?
 
-    fun isConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean
+    fun isKotlinConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean
 
     fun getSuperMethods(declaration: KtDeclaration, ignore: Collection<PsiElement>?) : List<PsiElement>
 
     fun sourcesAndLibraries(delegate: GlobalSearchScope, project: Project): GlobalSearchScope
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddElseBranchFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddElseBranchFix.kt
new file mode 100644
index 000000000000..addcad5b933d
--- /dev/null
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddElseBranchFix.kt
@@ -0,0 +1,92 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+
+package org.jetbrains.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.CodeInsightUtilCore
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiErrorElement
+import com.intellij.psi.util.elementType
+import org.jetbrains.kotlin.KtNodeTypes
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.util.executeEnterHandler
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.endOffset
+import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+sealed class AddElseBranchFix<T : KtExpression>(element: T) : KotlinPsiOnlyQuickFixAction<T>(element) {
+    override fun getFamilyName() = KotlinBundle.message("fix.add.else.branch.when")
+    override fun getText() = familyName
+
+    abstract override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean
+
+    abstract override fun invoke(project: Project, editor: Editor?, file: KtFile)
+}
+
+class AddWhenElseBranchFix(element: KtWhenExpression) : AddElseBranchFix<KtWhenExpression>(element) {
+    override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean = element?.closeBrace != null
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        val element = element ?: return
+        val whenCloseBrace = element.closeBrace ?: return
+        val entry = KtPsiFactory(file).createWhenEntry("else -> {}")
+        CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(element.addBefore(entry, whenCloseBrace))?.endOffset?.let { offset ->
+            editor?.caretModel?.moveToOffset(offset - 1)
+        }
+    }
+
+    companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
+        override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
+            return listOfNotNull(psiElement.getNonStrictParentOfType<KtWhenExpression>()?.let(::AddWhenElseBranchFix))
+        }
+    }
+}
+
+class AddIfElseBranchFix(element: KtIfExpression) : AddElseBranchFix<KtIfExpression>(element) {
+    override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean {
+        val ktIfExpression = element ?: return false
+        return ktIfExpression.`else` == null &&
+                ktIfExpression.condition != null &&
+                ktIfExpression.children.firstOrNull { it.elementType == KtNodeTypes.THEN }?.firstChild !is PsiErrorElement
+    }
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        val element = element ?: return
+        val withBraces = element.then is KtBlockExpression
+        val psiFactory = KtPsiFactory(file)
+        val newIf = psiFactory.createExpression(
+            if (withBraces) {
+                "if (true) {} else {}"
+            } else {
+                "if (true) 2 else TODO()"
+            }
+        ) as KtIfExpression
+
+        element.addRange(newIf.then?.parent?.nextSibling, newIf.`else`?.parent)
+        editor?.caretModel?.currentCaret?.let { caret ->
+            if (withBraces) {
+                caret.moveToOffset(element.endOffset - 1)
+                val documentManager = PsiDocumentManager.getInstance(project)
+                documentManager.getDocument(element.containingFile)?.let { doc ->
+                    documentManager.doPostponedOperationsAndUnblockDocument(doc)
+                    editor.executeEnterHandler()
+                }
+            } else {
+                element.`else`?.textRange?.let {
+                    caret.moveToOffset(it.startOffset)
+                    caret.setSelection(it.startOffset, it.endOffset)
+                }
+            }
+        }
+    }
+
+    companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
+        override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
+            return listOfNotNull(psiElement.parent?.safeAs<KtIfExpression>()?.let(::AddIfElseBranchFix))
+        }
+    }
+}
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.kt
deleted file mode 100644
index fb297eaef6c0..000000000000
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.quickfix
-
-import com.intellij.codeInsight.CodeInsightUtilCore
-import com.intellij.codeInsight.intention.IntentionAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.KtPsiFactory
-import org.jetbrains.kotlin.psi.KtWhenExpression
-import org.jetbrains.kotlin.psi.psiUtil.endOffset
-import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
-
-class AddWhenElseBranchFix(element: KtWhenExpression) : KotlinPsiOnlyQuickFixAction<KtWhenExpression>(element) {
-    override fun getFamilyName() = KotlinBundle.message("fix.add.else.branch.when")
-    override fun getText() = familyName
-
-    override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean = element?.closeBrace != null
-
-    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
-        val element = element ?: return
-        val whenCloseBrace = element.closeBrace ?: return
-        val entry = KtPsiFactory(file).createWhenEntry("else -> {}")
-        CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(element.addBefore(entry, whenCloseBrace))?.endOffset?.let { offset ->
-            editor?.caretModel?.moveToOffset(offset - 1)
-        }
-    }
-
-    companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
-        override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
-            return listOfNotNull(psiElement.getNonStrictParentOfType<KtWhenExpression>()?.let(::AddWhenElseBranchFix))
-        }
-    }
-}
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveWhenBranchFix.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveWhenBranchFix.kt
index 1690b5aa73ef..e2fe00d0735f 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveWhenBranchFix.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/quickfix/RemoveWhenBranchFix.kt
@@ -9,9 +9,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtWhenEntry
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 
@@ -33,10 +31,11 @@ class RemoveWhenBranchFix(
     companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
         override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
             val whenEntry = psiElement.getParentOfType<KtWhenEntry>(strict = false)
-                ?.takeIf { it.conditions.size == 1 }
-                ?: return emptyList()
+            if (whenEntry != null && (whenEntry.isElse || whenEntry.conditions.size == 1)) {
+                return listOf(RemoveWhenBranchFix(whenEntry))
+            }
 
-            return listOfNotNull(RemoveWhenBranchFix(whenEntry))
+            return emptyList()
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/references/ReadWriteAccessChecker.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/references/ReadWriteAccessChecker.kt
index ccd20a5b3eb3..72f964c3f80d 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/references/ReadWriteAccessChecker.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/references/ReadWriteAccessChecker.kt
@@ -3,22 +3,46 @@
 package org.jetbrains.kotlin.idea.references
 
 import com.intellij.openapi.components.service
-import org.jetbrains.kotlin.psi.KtBinaryExpression
-import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS
+import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis
 import org.jetbrains.kotlin.resolve.references.ReferenceAccess
+import org.jetbrains.kotlin.utils.addToStdlib.constant
 
 interface ReadWriteAccessChecker {
     fun readWriteAccessWithFullExpressionByResolve(assignment: KtBinaryExpression): Pair<ReferenceAccess, KtExpression>?
 
-    @Suppress("DEPRECATION")
     fun readWriteAccessWithFullExpression(
         targetExpression: KtExpression,
         useResolveForReadWrite: Boolean
-    ): Pair<ReferenceAccess, KtExpression> =
-        if (useResolveForReadWrite)
-            targetExpression.readWriteAccessWithFullExpressionWithPossibleResolve(::readWriteAccessWithFullExpressionByResolve)
+    ): Pair<ReferenceAccess, KtExpression> {
+        var expression = targetExpression.getQualifiedExpressionForSelectorOrThis()
+        loop@ while (true) {
+            when (val parent = expression.parent) {
+                is KtParenthesizedExpression, is KtAnnotatedExpression, is KtLabeledExpression -> expression = parent as KtExpression
+                else -> break@loop
+            }
+        }
+
+        val assignment = expression.getAssignmentByLHS()
+        if (assignment != null) {
+            return when (assignment.operationToken) {
+                KtTokens.EQ -> ReferenceAccess.WRITE to assignment
+
+                else -> {
+                    (if (useResolveForReadWrite) readWriteAccessWithFullExpressionByResolve(assignment) else null)
+                        ?: (ReferenceAccess.READ_WRITE to assignment)
+                }
+            }
+        }
+
+        val unaryExpression = expression.parent as? KtUnaryExpression
+        return if (unaryExpression != null && unaryExpression.operationToken in constant { setOf(KtTokens.PLUSPLUS, KtTokens.MINUSMINUS) })
+            ReferenceAccess.READ_WRITE to unaryExpression
         else
-            targetExpression.readWriteAccessWithFullExpressionWithPossibleResolve(readWriteAccessWithFullExpressionByResolve = { null })
+            ReferenceAccess.READ to expression
+    }
 
     companion object {
         fun getInstance(): ReadWriteAccessChecker = service()
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/KotlinSearchSupport.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/KotlinSearchSupport.kt
index dff3b26b24f4..80558e011c53 100644
--- a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/KotlinSearchSupport.kt
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/KotlinSearchSupport.kt
@@ -8,10 +8,13 @@ import com.intellij.openapi.util.NlsSafe
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.SearchScope
+import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.util.application.getServiceSafe
 import org.jetbrains.kotlin.idea.util.application.runReadAction
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.DataClassResolver
 import org.jetbrains.kotlin.resolve.ImportPath
 
 interface KotlinSearchUsagesSupport {
@@ -32,10 +35,22 @@ interface KotlinSearchUsagesSupport {
         val PsiClass.isSamInterface: Boolean
             get() = getInstance(project).isSamInterface(this)
 
-        fun <T : PsiNamedElement> List<T>.filterDataClassComponentsIfDisabled(kotlinOptions: KotlinReferencesSearchOptions): List<T> =
-            firstOrNull()?.let {
-                getInstance(it.project).filterDataClassComponentsIfDisabled(this, kotlinOptions)
-            } ?: this
+        fun <T : PsiNamedElement> List<T>.filterDataClassComponentsIfDisabled(kotlinOptions: KotlinReferencesSearchOptions): List<T> {
+            fun PsiNamedElement.isComponentElement(): Boolean {
+                if (this !is PsiMethod) return false
+
+                val dataClassParent = ((parent as? KtLightClass)?.kotlinOrigin as? KtClass)?.isData() == true
+                if (!dataClassParent) return false
+
+                if (!Name.isValidIdentifier(name)) return false
+                val nameIdentifier = Name.identifier(name)
+                if (!DataClassResolver.isComponentLike(nameIdentifier)) return false
+
+                return true
+            }
+
+            return if (kotlinOptions.searchForComponentConventions) this else filter { !it.isComponentElement() }
+        }
 
         fun PsiReference.isCallableOverrideUsage(declaration: KtNamedDeclaration): Boolean =
             getInstance(declaration.project).isCallableOverrideUsage(this, declaration)
@@ -121,8 +136,6 @@ interface KotlinSearchUsagesSupport {
 
     fun isSamInterface(psiClass: PsiClass): Boolean
 
-    fun <T : PsiNamedElement> filterDataClassComponentsIfDisabled(elements: List<T>, kotlinOptions: KotlinReferencesSearchOptions): List<T>
-
     fun isCallableOverrideUsage(reference: PsiReference, declaration: KtNamedDeclaration): Boolean
 
     fun isUsageInContainingDeclaration(reference: PsiReference, declaration: KtNamedDeclaration): Boolean
@@ -176,4 +189,4 @@ interface KotlinSearchUsagesSupport {
     fun createConstructorHandle(ktDeclaration: KtDeclaration): ConstructorCallHandle
 
     fun createConstructorHandle(psiMethod: PsiMethod): ConstructorCallHandle
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
new file mode 100644
index 000000000000..9cb96071066a
--- /dev/null
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
@@ -0,0 +1,81 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.search.ideaExtensions
+
+import com.intellij.codeInsight.JavaTargetElementEvaluator
+import com.intellij.codeInsight.TargetElementEvaluatorEx
+import com.intellij.codeInsight.TargetElementUtil
+import com.intellij.codeInsight.TargetElementUtilExtender
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiReference
+import com.intellij.util.BitUtil
+import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference
+import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
+import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.*
+
+abstract class KotlinTargetElementEvaluator : TargetElementEvaluatorEx, TargetElementUtilExtender {
+    companion object {
+        const val DO_NOT_UNWRAP_LABELED_EXPRESSION = 0x100
+        const val BYPASS_IMPORT_ALIAS = 0x200
+    }
+
+    // Place caret after the open curly brace in lambda for generated 'it'
+    abstract fun findLambdaOpenLBraceForGeneratedIt(ref: PsiReference): PsiElement?
+
+    // Navigate to receiver element for this in extension declaration
+    abstract fun findReceiverForThisInExtensionFunction(ref: PsiReference): PsiElement?
+
+    override fun getAdditionalDefinitionSearchFlags() = 0
+
+    override fun getAdditionalReferenceSearchFlags() = DO_NOT_UNWRAP_LABELED_EXPRESSION or BYPASS_IMPORT_ALIAS
+
+    override fun getAllAdditionalFlags() = additionalDefinitionSearchFlags + additionalReferenceSearchFlags
+
+    override fun includeSelfInGotoImplementation(element: PsiElement): Boolean = !(element is KtClass && element.isAbstract())
+
+    override fun getElementByReference(ref: PsiReference, flags: Int): PsiElement? {
+        if (ref is KtSimpleNameReference && ref.expression is KtLabelReferenceExpression) {
+            val refTarget = ref.resolve() as? KtExpression ?: return null
+            if (!BitUtil.isSet(flags, DO_NOT_UNWRAP_LABELED_EXPRESSION)) {
+                return refTarget.getLabeledParent(ref.expression.getReferencedName()) ?: refTarget
+            }
+            return refTarget
+        }
+
+        if (!BitUtil.isSet(flags, BYPASS_IMPORT_ALIAS)) {
+            (ref.element as? KtSimpleNameExpression)?.mainReference?.getImportAlias()?.let { return it }
+        }
+
+        // prefer destructing declaration entry to its target if element name is accepted
+        if (ref is KtDestructuringDeclarationReference && BitUtil.isSet(flags, TargetElementUtil.ELEMENT_NAME_ACCEPTED)) {
+            return ref.element
+        }
+
+        val refExpression = ref.element as? KtSimpleNameExpression
+        val calleeExpression = refExpression?.getParentOfTypeAndBranch<KtCallElement> { calleeExpression }
+        if (calleeExpression != null) {
+            (ref.resolve() as? KtConstructor<*>)?.let {
+                return if (flags and JavaTargetElementEvaluator().additionalReferenceSearchFlags != 0) it else it.containingClassOrObject
+            }
+        }
+
+        if (BitUtil.isSet(flags, TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED)) {
+            return findLambdaOpenLBraceForGeneratedIt(ref)
+                ?: findReceiverForThisInExtensionFunction(ref)
+        }
+
+        return null
+    }
+
+    override fun isIdentifierPart(file: PsiFile, text: CharSequence, offset: Int): Boolean {
+        val elementAtCaret = file.findElementAt(offset)
+
+        if (elementAtCaret?.node?.elementType == KtTokens.IDENTIFIER) return true
+        // '(' is considered identifier part if it belongs to primary constructor without 'constructor' keyword
+        return elementAtCaret?.getNonStrictParentOfType<KtPrimaryConstructor>()?.textOffset == offset
+    }
+}
diff --git a/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/util/editorUtils.kt b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/util/editorUtils.kt
new file mode 100644
index 000000000000..a304a606bcf8
--- /dev/null
+++ b/plugins/kotlin/frontend-independent/src/org/jetbrains/kotlin/idea/util/editorUtils.kt
@@ -0,0 +1,13 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.util
+
+import com.intellij.ide.DataManager
+import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.actionSystem.EditorActionManager
+
+fun Editor.executeEnterHandler() {
+    EditorActionManager.getInstance()
+        .getActionHandler(IdeActions.ACTION_EDITOR_ENTER)
+        .execute(/* editor = */ this, /* contextCaret = */ null, /* dataContext = */ DataManager.getInstance().getDataContext(component))
+}
diff --git a/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt b/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
index 63e2d371c2b5..bfc9651f9dbc 100644
--- a/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
+++ b/plugins/kotlin/frontend-independent/tests/test/org/jetbrains/kotlin/test/utils/IgnoreTests.kt
@@ -10,8 +10,7 @@ import org.slf4j.LoggerFactory
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
-import kotlin.io.path.useLines
-import kotlin.io.path.writeLines
+import kotlin.io.path.*
 
 object IgnoreTests {
     private const val INSERT_DIRECTIVE_AUTOMATICALLY = false // TODO use environment variable instead
@@ -90,7 +89,6 @@ object IgnoreTests {
             test()
             return
         }
-
         val testIsEnabled = directive.isEnabledInFile(testFile)
 
         try {
@@ -201,13 +199,18 @@ object IgnoreTests {
         return isEnabledIfDirectivePresent(isDirectivePresent)
     }
 
-    private fun containsDirective(file: Path, directive: EnableOrDisableTestDirective): Boolean =
-        file.useLines { lines -> lines.any { it.isLineWithDirective(directive) } }
+    private fun containsDirective(file: Path, directive: EnableOrDisableTestDirective): Boolean {
+        if (file.notExists()) return false
+        return file.useLines { lines -> lines.any { it.isLineWithDirective(directive) } }
+    }
 
     private fun String.isLineWithDirective(directive: EnableOrDisableTestDirective): Boolean =
         substringBefore(':').trim() == directive.directiveText.trim()
 
     private fun Path.insertDirective(directive: EnableOrDisableTestDirective, directivePosition: DirectivePosition) {
+        if (notExists()) {
+            createFile()
+        }
         toFile().apply {
             val originalText = readText()
             val textWithDirective = when (directivePosition) {
diff --git a/plugins/kotlin/generators/kotlin.generators.iml b/plugins/kotlin/generators/kotlin.generators.iml
index 5a1abcc8857a..e875181e0dfd 100644
--- a/plugins/kotlin/generators/kotlin.generators.iml
+++ b/plugins/kotlin/generators/kotlin.generators.iml
@@ -27,7 +27,6 @@
     <orderEntry type="module" module-name="kotlin.fir.fir-fe10-binding" />
     <orderEntry type="module" module-name="kotlin.fir.fir-low-level-api-ide-impl" />
     <orderEntry type="module" module-name="kotlin.fir.analysis-api-providers-ide-impl" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-fir" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
@@ -36,7 +35,6 @@
     <orderEntry type="module" module-name="intellij.platform.jps.build" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.tests" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.refIndex.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.coverage.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.copyright.tests" scope="TEST" />
diff --git a/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt b/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
index c2d86a6a76f2..b921c6f2b5d8 100644
--- a/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
+++ b/plugins/kotlin/generators/test/org/jetbrains/kotlin/testGenerator/GenerateTests.kt
@@ -57,7 +57,6 @@ import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateJavaToLib
 import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToDecompiledLibraryTest
 import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTest
 import org.jetbrains.kotlin.idea.decompiler.navigation.AbstractNavigateToLibrarySourceTestWithJS
-import org.jetbrains.kotlin.idea.decompiler.stubBuilder.AbstractClsStubBuilderTest
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.AbstractLoadJavaClsStubTest
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractCommonDecompiledTextFromJsMetadataTest
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractCommonDecompiledTextTest
@@ -67,39 +66,35 @@ import org.jetbrains.kotlin.idea.editor.AbstractMultiLineStringIndentTest
 import org.jetbrains.kotlin.idea.editor.backspaceHandler.AbstractBackspaceHandlerTest
 import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractQuickDocProviderTest
 import org.jetbrains.kotlin.idea.externalAnnotations.AbstractExternalAnnotationTest
-//import org.jetbrains.kotlin.idea.fir.low.level.api.AbstractFirLibraryModuleDeclarationResolveTest
+import org.jetbrains.kotlin.idea.fir.analysis.providers.AbstractKotlinIdeAnnotationsResolverTest
+import org.jetbrains.kotlin.idea.fir.low.level.api.AbstractFirLibraryModuleDeclarationResolveTest
+import org.jetbrains.kotlin.idea.fir.analysis.providers.sessions.AbstractSessionsInvalidationTest
+import org.jetbrains.kotlin.idea.fir.analysis.providers.trackers.AbstractProjectWideOutOfBlockKotlinModificationTrackerTest
+import org.jetbrains.kotlin.idea.fir.codeInsight.handlers.AbstractHLGotoSuperActionHandlerTest
+import org.jetbrains.kotlin.idea.fir.completion.AbstractFirKeywordCompletionTest
+import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelJvmBasicCompletionTest
+import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest
+import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractFirKeywordCompletionHandlerTest
+import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractHighLevelBasicCompletionHandlerTest
+import org.jetbrains.kotlin.idea.fir.completion.wheigher.AbstractHighLevelWeigherTest
+import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest
+import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest
+import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest
+import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest
+import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingMetaInfoTest
+import org.jetbrains.kotlin.idea.fir.imports.AbstractFirJvmOptimizeImportsTest
+import org.jetbrains.kotlin.idea.fir.inspections.AbstractFe10BindingIntentionTest
+import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest
+import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest
+import org.jetbrains.kotlin.idea.fir.intentions.AbstractHLIntentionTest
+import org.jetbrains.kotlin.idea.fir.parameterInfo.AbstractFirParameterInfoTest
+import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixMultiFileTest
+import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest
+import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest
+import org.jetbrains.kotlin.idea.fir.search.AbstractHLImplementationSearcherTest
+import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest
+import org.jetbrains.kotlin.idea.fir.uast.*
 import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
-//import org.jetbrains.kotlin.idea.fir.analysis.providers.sessions.AbstractSessionsInvalidationTest
-//import org.jetbrains.kotlin.idea.fir.analysis.providers.trackers.AbstractProjectWideOutOfBlockKotlinModificationTrackerTest
-//import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirClassLoadingTest
-//import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightClassTest
-//import org.jetbrains.kotlin.idea.fir.asJava.classes.AbstractFirLightFacadeClassTest
-//import org.jetbrains.kotlin.idea.fir.codeInsight.handlers.AbstractHLGotoSuperActionHandlerTest
-//import org.jetbrains.kotlin.idea.fir.completion.AbstractFirKeywordCompletionTest
-//import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelJvmBasicCompletionTest
-//import org.jetbrains.kotlin.idea.fir.completion.AbstractHighLevelMultiFileJvmBasicCompletionTest
-//import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractFirKeywordCompletionHandlerTest
-//import org.jetbrains.kotlin.idea.fir.completion.test.handlers.AbstractHighLevelBasicCompletionHandlerTest
-//import org.jetbrains.kotlin.idea.fir.completion.wheigher.AbstractHighLevelWeigherTest
-//import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesFirTest
-//import org.jetbrains.kotlin.idea.fir.findUsages.AbstractFindUsagesWithDisableComponentSearchFirTest
-//import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithLibraryFirTest
-//import org.jetbrains.kotlin.idea.fir.findUsages.AbstractKotlinFindUsagesWithStdlibFirTest
-//import org.jetbrains.kotlin.idea.fir.highlighter.AbstractFirHighlightingMetaInfoTest
-//import org.jetbrains.kotlin.idea.fir.imports.AbstractFirJvmOptimizeImportsTest
-//import org.jetbrains.kotlin.idea.fir.inspections.AbstractFe10BindingIntentionTest
-//import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLInspectionTest
-//import org.jetbrains.kotlin.idea.fir.inspections.AbstractHLLocalInspectionTest
-//import org.jetbrains.kotlin.idea.fir.intentions.AbstractHLIntentionTest
-//import org.jetbrains.kotlin.idea.fir.low.level.api.AbstractFirLibraryModuleDeclarationResolveTest
-//import org.jetbrains.kotlin.idea.fir.parameterInfo.AbstractFirParameterInfoTest
-//import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixMultiFileTest
-//import org.jetbrains.kotlin.idea.fir.quickfix.AbstractHighLevelQuickFixTest
-//import org.jetbrains.kotlin.idea.fir.resolve.AbstractFirReferenceResolveTest
-//import org.jetbrains.kotlin.idea.fir.search.AbstractHLImplementationSearcherTest
-//import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest
-//import org.jetbrains.kotlin.idea.fir.uast.*
-//import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest
 import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyWithLibTest
 import org.jetbrains.kotlin.idea.highlighter.*
@@ -158,9 +153,6 @@ import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest
 import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest
 import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest
 import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest
-import org.jetbrains.kotlin.jps.build.*
-import org.jetbrains.kotlin.jps.incremental.AbstractJsProtoComparisonTest
-import org.jetbrains.kotlin.jps.incremental.AbstractJvmProtoComparisonTest
 import org.jetbrains.kotlin.nj2k.*
 import org.jetbrains.kotlin.nj2k.inference.common.AbstractCommonConstraintCollectorTest
 import org.jetbrains.kotlin.nj2k.inference.mutability.AbstractMutabilityInferenceTest
@@ -170,8 +162,7 @@ import org.jetbrains.kotlin.pacelize.ide.test.AbstractParcelizeQuickFixTest
 import org.jetbrains.kotlin.psi.patternMatching.AbstractPsiUnifierTest
 import org.jetbrains.kotlin.search.AbstractAnnotatedMembersSearchTest
 import org.jetbrains.kotlin.search.AbstractInheritorsSearchTest
-//import org.jetbrains.kotlin.idea.fir.shortenRefs.AbstractFirShortenRefsTest
-//import org.jetbrains.kotlin.idea.fir.uast.*
+import org.jetbrains.kotlin.idea.fir.uast.*
 import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest
 import org.jetbrains.kotlin.test.TargetBackend
 import org.jetbrains.kotlin.testGenerator.generator.TestGenerator
@@ -232,6 +223,12 @@ private fun assembleWorkspace(): TWorkspace = workspace {
             model("evaluation/multipleBreakpoints", testMethodName = "doMultipleBreakpointsTest", targetBackend = TargetBackend.JVM_IR_WITH_OLD_EVALUATOR)
         }
 
+        testClass<AbstractKotlinEvaluateExpressionInMppTest> {
+            model("evaluation/singleBreakpoint", testMethodName = "doSingleBreakpointTest", targetBackend = TargetBackend.JVM_IR_WITH_OLD_EVALUATOR)
+            model("evaluation/multipleBreakpoints", testMethodName = "doMultipleBreakpointsTest", targetBackend = TargetBackend.JVM_IR_WITH_OLD_EVALUATOR)
+            model("evaluation/multiplatform", testMethodName = "doMultipleBreakpointsTest", targetBackend = TargetBackend.JVM_IR_WITH_IR_EVALUATOR)
+        }
+
         testClass<AbstractKotlinEvaluateExpressionWithIRFragmentCompilerTest> {
             model("evaluation/singleBreakpoint", testMethodName = "doSingleBreakpointTest", targetBackend = TargetBackend.JVM_WITH_IR_EVALUATOR)
             model("evaluation/multipleBreakpoints", testMethodName = "doMultipleBreakpointsTest", targetBackend = TargetBackend.JVM_WITH_IR_EVALUATOR)
@@ -815,10 +812,6 @@ private fun assembleWorkspace(): TWorkspace = workspace {
             model("decompiler/decompiledTextJs", pattern = Patterns.forRegex("""^([^\.]+)$"""), targetBackend = TargetBackend.JS)
         }
 
-        testClass<AbstractClsStubBuilderTest> {
-            model("decompiler/stubBuilder", pattern = DIRECTORY, isRecursive = false)
-        }
-
         testClass<AbstractAutoImportTest> {
             model("editor/autoImport", testMethodName = "doTest", testClassName = "WithAutoImport", pattern = DIRECTORY, isRecursive = false)
             model("editor/autoImport", testMethodName = "doTestWithoutAutoImport", testClassName = "WithoutAutoImport", pattern = DIRECTORY, isRecursive = false)
@@ -1003,21 +996,7 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         }
     }
 
-    /*testGroup("fir", testDataPath = AdditionalKotlinArtifacts.compilerTestData("compiler/testData")) {
-        testClass<AbstractFirLightClassTest> {
-            model("asJava/lightClasses", excludedDirectories = listOf("delegation", "script"), pattern = KT_WITHOUT_DOTS)
-        }
-
-        testClass<AbstractFirClassLoadingTest> {
-            model("asJava/ultraLightClasses", pattern = KT_OR_KTS)
-        }
-
-        testClass<AbstractFirLightFacadeClassTest> {
-            model("asJava/ultraLightFacades", pattern = KT_OR_KTS)
-        }
-    }*/
-
-    /*testGroup("analysis-api-providers-ide-impl") {
+    testGroup("analysis-api-providers-ide-impl") {
         testClass<AbstractProjectWideOutOfBlockKotlinModificationTrackerTest> {
             model("outOfBlockProjectWide")
         }
@@ -1029,13 +1008,17 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         testClass<AbstractSessionsInvalidationTest> {
             model("sessionInvalidation", pattern = DIRECTORY, isRecursive = false)
         }
+
+        testClass<AbstractKotlinIdeAnnotationsResolverTest> {
+            model("annotationsResolver", pattern = KT_WITHOUT_DOTS)
+        }
     }
 
     testGroup("fir-low-level-api-ide-impl") {
         testClass<AbstractFirLibraryModuleDeclarationResolveTest> {
             model("libraryModuleResolve", isRecursive = false)
         }
-    }*/
+    }
 
     /*testGroup("idea/idea-fir-performance-tests/tests", "idea") {
          testClass<AbstractFirHighlightingPerformanceTest> {
@@ -1049,7 +1032,7 @@ private fun assembleWorkspace(): TWorkspace = workspace {
          }
      }*/
 
-    /*testGroup("fir", testDataPath = "../idea/tests/testData") {
+    testGroup("fir", testDataPath = "../idea/tests/testData") {
         testClass<AbstractFirReferenceResolveTest> {
             model("resolve/references", pattern = KT_WITHOUT_DOTS)
         }
@@ -1130,18 +1113,18 @@ private fun assembleWorkspace(): TWorkspace = workspace {
             model("editor/optimizeImports/jvm", pattern = KT_WITHOUT_DOTS)
             model("editor/optimizeImports/common", pattern = KT_WITHOUT_DOTS)
         }
-    }*/
+    }
 
-    /*testGroup("fir", testDataPath = "..") {
+    testGroup("fir", testDataPath = "..") {
         testClass<AbstractHLLocalInspectionTest> {
             val pattern = Patterns.forRegex("^([\\w\\-_]+)\\.(kt|kts)$")
             model("idea/tests/testData/inspectionsLocal/unusedVariable", pattern = pattern)
             model("idea/tests/testData/inspectionsLocal/redundantVisibilityModifier", pattern = pattern)
             model("fir/testData/inspectionsLocal", pattern = pattern)
         }
-    }*/
+    }
 
-    /*testGroup("fir", testDataPath = "../completion/tests/testData") {
+    testGroup("fir", testDataPath = "../completion/tests/testData") {
         testClass<AbstractHighLevelJvmBasicCompletionTest> {
             model("basic/common", pattern = KT_WITHOUT_FIR_PREFIX)
             model("basic/java", pattern = KT_WITHOUT_FIR_PREFIX)
@@ -1173,9 +1156,9 @@ private fun assembleWorkspace(): TWorkspace = workspace {
                 pattern = KT_WITHOUT_FIR_PREFIX
             )
         }
-    }*/
+    }
 
-    /*testGroup("fir", testDataPath = "../idea/tests/testData/findUsages") {
+    testGroup("fir", testDataPath = "../idea/tests/testData/findUsages") {
         testClass<AbstractFindUsagesFirTest> {
             model("kotlin", pattern = Patterns.forRegex("""^(.+)\.0\.(kt|kts)$"""))
             model("java", pattern = Patterns.forRegex("""^(.+)\.0\.java$"""))
@@ -1193,9 +1176,9 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         testClass<AbstractKotlinFindUsagesWithStdlibFirTest> {
             model("stdlibUsages", pattern = Patterns.forRegex("""^(.+)\.0\.kt$"""))
         }
-    }*/
+    }
 
-    /*testGroup("fir") {
+    testGroup("fir") {
         testClass<AbstractHLGotoSuperActionHandlerTest> {
             model("codeInsight/handlers/gotoSuperActionHandler", pattern = KT_WITHOUT_DOTS)
         }
@@ -1203,7 +1186,7 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         testClass<AbstractHLImplementationSearcherTest> {
             model("search/implementations", pattern = KT_WITHOUT_DOTS)
         }
-    }*/
+    }
 
 
     /*testGroup("fir-fe10-binding", testDataPath = "../idea/tests") {
@@ -1464,69 +1447,6 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         }
     }
 
-    testGroup("jps/jps-plugin/tests") {
-        testClass<AbstractIncrementalJvmJpsTest> {
-            model("incremental/multiModule/common", pattern = DIRECTORY, targetBackend = TargetBackend.JVM_IR)
-            model("incremental/multiModule/jvm", pattern = DIRECTORY)
-            model("incremental/multiModule/multiplatform/custom", pattern = DIRECTORY, targetBackend = TargetBackend.JVM_IR)
-            model("incremental/pureKotlin", pattern = DIRECTORY, isRecursive = false, targetBackend = TargetBackend.JVM_IR)
-            model("incremental/withJava", pattern = DIRECTORY, targetBackend = TargetBackend.JVM_IR)
-            model("incremental/inlineFunCallSite", pattern = DIRECTORY, targetBackend = TargetBackend.JVM_IR)
-            model("incremental/classHierarchyAffected", pattern = DIRECTORY, targetBackend = TargetBackend.JVM_IR)
-        }
-
-        //actualizeMppJpsIncTestCaseDirs(testDataAbsoluteRoot, "incremental/multiModule/multiplatform/withGeneratedContent")
-
-        testClass<AbstractIncrementalJsJpsTest> {
-            model("incremental/multiModule/common", pattern = DIRECTORY)
-        }
-
-        testClass<AbstractMultiplatformJpsTestWithGeneratedContent> {
-            model("incremental/multiModule/multiplatform/withGeneratedContent", isRecursive = true, pattern = DIRECTORY, testClassName = "MultiplatformMultiModule")
-        }
-
-        testClass<AbstractJvmLookupTrackerTest> {
-            model("incremental/lookupTracker/jvm", pattern = DIRECTORY, isRecursive = false)
-        }
-        testClass<AbstractJsLookupTrackerTest> {
-            model("incremental/lookupTracker/js", pattern = DIRECTORY, isRecursive = false)
-        }
-        testClass<AbstractJsKlibLookupTrackerTest> { // todo: investigate why lookups are different from non-klib js
-            model("incremental/lookupTracker/jsKlib", pattern = DIRECTORY, isRecursive = false)
-        }
-
-        testClass<AbstractIncrementalLazyCachesTest> {
-            model("incremental/lazyKotlinCaches", pattern = DIRECTORY)
-            model("incremental/changeIncrementalOption", pattern = DIRECTORY)
-        }
-
-        testClass<AbstractIncrementalCacheVersionChangedTest> {
-            model("incremental/cacheVersionChanged", pattern = DIRECTORY)
-        }
-
-        testClass<AbstractDataContainerVersionChangedTest> {
-            model("incremental/cacheVersionChanged", pattern = DIRECTORY)
-        }
-
-        fun MutableTSuite.commonProtoComparisonTests() {
-            model("comparison/classSignatureChange", pattern = DIRECTORY)
-            model("comparison/classPrivateOnlyChange", pattern = DIRECTORY)
-            model("comparison/classMembersOnlyChanged", pattern = DIRECTORY)
-            model("comparison/packageMembers", pattern = DIRECTORY)
-            model("comparison/unchanged", pattern = DIRECTORY)
-        }
-
-        testClass<AbstractJvmProtoComparisonTest> {
-            commonProtoComparisonTests()
-            model("comparison/jvmOnly", pattern = DIRECTORY)
-        }
-
-        testClass<AbstractJsProtoComparisonTest> {
-            commonProtoComparisonTests()
-            model("comparison/jsOnly", pattern = DIRECTORY)
-        }
-    }
-
     testGroup("refIndex/tests") {
         testClass<AbstractKotlinCompilerReferenceTest> {
             model("compilerIndex", pattern = DIRECTORY)
@@ -1550,7 +1470,7 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         }
     }
 
-    /*testGroup("uast/uast-kotlin-fir") {
+    testGroup("uast/uast-kotlin-fir") {
         testClass<AbstractFirUastDeclarationTest> {
             model("declaration")
         }
@@ -1558,9 +1478,9 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         testClass<AbstractFirUastTypesTest> {
             model("type")
         }
-    }*/
+    }
 
-    /*testGroup("uast/uast-kotlin-fir", testDataPath = "../uast-kotlin/tests/testData") {
+    testGroup("uast/uast-kotlin-fir", testDataPath = "../uast-kotlin/tests/testData") {
         testClass<AbstractFirLegacyUastDeclarationTest> {
             model("")
         }
@@ -1580,7 +1500,7 @@ private fun assembleWorkspace(): TWorkspace = workspace {
         testClass<AbstractFirLegacyUastValuesTest> {
             model("")
         }
-    }*/
+    }
 
     testGroup("uast/uast-kotlin/tests", testDataPath = "../../uast-kotlin-fir/testData") {
         testClass<AbstractFE1UastDeclarationTest> {
diff --git a/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml b/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
index 98afc115b9d2..0ebc26674ae3 100644
--- a/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
+++ b/plugins/kotlin/gradle/gradle-idea/kotlin.gradle.gradle-idea.iml
@@ -32,7 +32,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-gradle-statistics" level="project" />
@@ -41,7 +41,7 @@
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.formatter" />
diff --git a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/KotlinMPPDataNodes.kt b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/KotlinMPPDataNodes.kt
index 05c85ef67b56..91b71885b001 100644
--- a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/KotlinMPPDataNodes.kt
+++ b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/KotlinMPPDataNodes.kt
@@ -16,10 +16,7 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.config.ExternalSystemRunTask
 import org.jetbrains.kotlin.idea.gradleTooling.KotlinImportingDiagnosticsContainer
 import org.jetbrains.kotlin.idea.gradleTooling.KotlinPlatformContainerImpl
-import org.jetbrains.kotlin.idea.projectModel.KonanArtifactModel
-import org.jetbrains.kotlin.idea.projectModel.KotlinModule
-import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
-import org.jetbrains.kotlin.idea.projectModel.KotlinPlatformContainer
+import org.jetbrains.kotlin.idea.projectModel.*
 import org.jetbrains.kotlin.idea.util.CopyableDataNodeUserDataProperty
 import org.jetbrains.plugins.gradle.util.GradleConstants
 import java.io.File
@@ -40,7 +37,15 @@ val DataNode<out ModuleData>.kotlinSourceSetData: KotlinSourceSetData?
 val DataNode<out ModuleData>.kotlinAndroidSourceSets: List<KotlinSourceSetInfo>?
     get() = ExternalSystemApiUtil.getChildren(this, KotlinAndroidSourceSetData.KEY).firstOrNull()?.data?.sourceSetInfos
 
-class KotlinSourceSetInfo @PropertyMapping("kotlinModule") constructor(val kotlinModule: KotlinModule) : Serializable {
+class KotlinSourceSetInfo @PropertyMapping("kotlinComponent") constructor(val kotlinComponent: KotlinComponent) : Serializable {
+    @Suppress("DEPRECATION_ERROR")
+    @Deprecated(
+        level = DeprecationLevel.WARNING,
+        message = "Use KotlinSourceSetInfo#kotlinComponent instead",
+        replaceWith = ReplaceWith("kotlinComponent")
+    )
+    val kotlinModule: KotlinModule
+        get() = kotlinComponent
     var moduleId: String? = null
     var gradleModuleId: String = ""
 
diff --git a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/cachedCompilerArgumentsRestoring.kt b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/cachedCompilerArgumentsRestoring.kt
index b309d62bd21c..c60a5c884a44 100644
--- a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/cachedCompilerArgumentsRestoring.kt
+++ b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/cachedCompilerArgumentsRestoring.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.idea.projectModel.ArgsInfo
 import org.jetbrains.kotlin.idea.projectModel.CompilerArgumentsCacheAware
 import org.jetbrains.kotlin.idea.projectModel.KotlinCachedCompilerArgument
 import org.jetbrains.kotlin.idea.projectModel.KotlinRawCompilerArgument
+import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments
 import java.io.File
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.KProperty1
@@ -48,6 +49,7 @@ class EmptyFlatArgsInfo : FlatSerializedArgsInfo {
 
 object CachedArgumentsRestoring {
     private val LOGGER = Logger.getInstance(CachedArgumentsRestoring.javaClass)
+    private const val STUB_K_2_NATIVE_COMPILER_ARGUMENTS_CLASS = "org.jetbrains.kotlin.gradle.tasks.StubK2NativeCompilerArguments"
     fun restoreSerializedArgsInfo(
         cachedSerializedArgsInfo: CachedSerializedArgsInfo,
         compilerArgumentsCacheHolder: CompilerArgumentsCacheHolder
@@ -102,7 +104,12 @@ object CachedArgumentsRestoring {
                 LOGGER.error("Failed to restore name of compiler arguments class from id $it! 'CommonCompilerArguments' instance was created instead")
             }
         }
-        val compilerArgumentsClass = Class.forName(compilerArgumentsClassName) as Class<out CommonCompilerArguments>
+        //TODO: Fixup. Remove it once actual K2NativeCompilerArguments will be available without 'kotlin.native.enabled = true' flag
+        val compilerArgumentsClass = if (compilerArgumentsClassName == STUB_K_2_NATIVE_COMPILER_ARGUMENTS_CLASS)
+            FakeK2NativeCompilerArguments::class.java
+        else
+            Class.forName(compilerArgumentsClassName) as Class<out CommonCompilerArguments>
+
         val newCompilerArgumentsBean = compilerArgumentsClass.getConstructor().newInstance()
         val propertiesByName = compilerArgumentsClass.kotlin.memberProperties.associateBy { it.name }
         cachedBucket.singleArguments.entries.mapNotNull {
diff --git a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/utils/KotlinSourceSetGraphUtil.kt b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/utils/KotlinSourceSetGraphUtil.kt
index 52c5f6883809..c815adddb5a6 100644
--- a/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/utils/KotlinSourceSetGraphUtil.kt
+++ b/plugins/kotlin/gradle/gradle-idea/src/org/jetbrains/kotlin/idea/gradle/configuration/utils/KotlinSourceSetGraphUtil.kt
@@ -43,7 +43,7 @@ fun createSourceSetDependsOnGraph(
 fun MutableGraph<KotlinSourceSet>.putInferredTestToProductionEdges() {
     val sourceSets = this.nodes()
     for (sourceSet in sourceSets) {
-        if (sourceSet.isTestModule) {
+        if (sourceSet.isTestComponent) {
             @OptIn(UnsafeTestSourceSetHeuristicApi::class)
             val predictedMainSourceSetName = predictedProductionSourceSetName(sourceSet.name)
             val predictedMainSourceSet = sourceSets.firstOrNull { it.name == predictedMainSourceSetName } ?: continue
@@ -63,7 +63,7 @@ private fun getFixedDependsOnSourceSets(
     val implicitDependsOnEdgeForAndroid = if (
         sourceSet.actualPlatforms.contains(KotlinPlatform.ANDROID) && sourceSet.declaredDependsOnSourceSets.isEmpty()
     ) {
-        val commonSourceSetName = if (sourceSet.isTestModule) KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME
+        val commonSourceSetName = if (sourceSet.isTestComponent) KotlinSourceSet.COMMON_TEST_SOURCE_SET_NAME
         else KotlinSourceSet.COMMON_MAIN_SOURCE_SET_NAME
         listOfNotNull(sourceSetsByName[commonSourceSetName])
     } else emptyList()
diff --git a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
index 6ac1a61042fb..b50b04275499 100644
--- a/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
+++ b/plugins/kotlin/gradle/gradle-java/kotlin.gradle.gradle-java.iml
@@ -32,13 +32,13 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-gradle-statistics" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm-run-configurations" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.idea" />
diff --git a/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml b/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
index ed05f57a06ee..66abfdc0b243 100644
--- a/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
+++ b/plugins/kotlin/gradle/gradle-java/resources/kotlin.gradle.gradle-java.xml
@@ -34,6 +34,7 @@
     <projectResolve implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinGradleCoroutineDebugProjectResolver" order="last"/>
     <projectResolve implementation="org.jetbrains.kotlin.idea.gradleJava.testing.KotlinTestTasksResolver"/>
     <projectResolve implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinMPPGradleProjectResolver"/>
+    <projectResolve implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.kpm.KotlinKPMGradleProjectResolver"/>
 
     <orderEnumerationHandlerFactory implementation="org.jetbrains.kotlin.idea.gradleJava.execution.KotlinGradleOrderEnumerationHandler$Factory" order="first"/>
 
@@ -59,6 +60,7 @@
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.klib.KotlinNativeLibraryDataService"/>
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinSourceSetDataService"/>
     <externalProjectDataService implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinGradleProjectSettingsDataService"/>
+    <externalProjectDataService implementation="org.jetbrains.kotlin.idea.gradleJava.configuration.kpm.KotlinFragmentDataService"/>
 
     <externalSystemTaskNotificationListener implementation="org.jetbrains.kotlin.idea.gradleJava.scripting.importing.KotlinDslSyncListener"/>
 
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/CompilerArgumentsCacheMergeManager.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/CompilerArgumentsCacheMergeManager.kt
index 2c07e6c88331..9cac12fd0a2b 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/CompilerArgumentsCacheMergeManager.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/CompilerArgumentsCacheMergeManager.kt
@@ -21,10 +21,10 @@ abstract class CompilerArgumentsCacheMergeManager {
 
 object KotlinCompilerArgumentsCacheMergeManager : CompilerArgumentsCacheMergeManager() {
     override fun doCollectCacheAware(gradleModule: IdeaModule, resolverCtx: ProjectResolverContext): CompilerArgumentsCacheAware? =
-        resolverCtx.getExtraProject(gradleModule, KotlinGradleModel::class.java)?.partialCacheAware
+        resolverCtx.getExtraProject(gradleModule, KotlinGradleModel::class.java)?.cacheAware
 }
 
 object KotlinMPPCompilerArgumentsCacheMergeManager : CompilerArgumentsCacheMergeManager() {
     override fun doCollectCacheAware(gradleModule: IdeaModule, resolverCtx: ProjectResolverContext): CompilerArgumentsCacheAware? =
-        resolverCtx.getMppModel(gradleModule)?.partialCacheAware
+        resolverCtx.getMppModel(gradleModule)?.cacheAware
 }
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
index 73f1e3c3e558..6cedee1b6459 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
@@ -207,7 +207,7 @@ class KotlinGradleLibraryDataService : AbstractProjectDataService<LibraryData, V
     }
 }
 
-fun detectPlatformKindByPlugin(moduleNode: DataNode<ModuleData>): IdePlatformKind<*>? {
+fun detectPlatformKindByPlugin(moduleNode: DataNode<ModuleData>): IdePlatformKind? {
     val pluginId = moduleNode.kotlinGradleProjectDataOrNull?.platformPluginId
     return IdePlatformKind.ALL_KINDS.firstOrNull { it.tooling.gradlePluginId == pluginId }
 }
@@ -227,7 +227,7 @@ fun detectPlatformByPlugin(moduleNode: DataNode<ModuleData>): TargetPlatformKind
     }
 }
 
-private fun detectPlatformByLibrary(moduleNode: DataNode<ModuleData>): IdePlatformKind<*>? {
+private fun detectPlatformByLibrary(moduleNode: DataNode<ModuleData>): IdePlatformKind? {
     val detectedPlatforms =
         mavenLibraryIdToPlatform.entries
             .filter { moduleNode.getResolvedVersionByModuleData(KOTLIN_GROUP_ID, listOf(it.key)) != null }
@@ -317,7 +317,7 @@ fun configureFacetByGradleModule(
     return kotlinFacet
 }
 
-private fun KotlinFacetSettings.configureOutputPaths(moduleNode: DataNode<ModuleData>, platformKind: IdePlatformKind<*>?) {
+private fun KotlinFacetSettings.configureOutputPaths(moduleNode: DataNode<ModuleData>, platformKind: IdePlatformKind?) {
 
     fun DataNode<KotlinGradleSourceSetData>.compilerArgumentsOrNull(cacheHolder: CompilerArgumentsCacheHolder): CommonCompilerArguments? =
         CachedArgumentsRestoring.restoreExtractedArgs(data.cachedArgsInfo, cacheHolder).currentCompilerArguments
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinMPPGradleProjectResolver.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinMPPGradleProjectResolver.kt
index c1cf7eab1e77..63c54b33a1dd 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinMPPGradleProjectResolver.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinMPPGradleProjectResolver.kt
@@ -424,7 +424,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
 
                     // TODO NOW: Use TestSourceSetUtil instead!
 
-                    if (sourceSet.isTestModule) {
+                    if (sourceSet.isTestComponent) {
                         it.productionModuleId = getInternalModuleName(
                             gradleModule,
                             externalProject,
@@ -494,7 +494,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 val path = toCanonicalPath(target.jar!!.archiveFile!!.absolutePath)
                 val currentModules = userData[path] ?: ArrayList<String>().apply { userData[path] = this }
                 // Test modules should not be added. Otherwise we could get dependnecy of java.mail on jvmTest
-                val allSourceSets = target.compilations.filter { !it.isTestModule }.flatMap { it.declaredSourceSets }.toSet()
+                val allSourceSets = target.compilations.filter { !it.isTestComponent }.flatMap { it.declaredSourceSets }.toSet()
                 val availableViaDependsOn = allSourceSets.flatMap { it.allDependsOnSourceSets }.mapNotNull { mppModel.sourceSetsByName[it] }
                 allSourceSets.union(availableViaDependsOn).forEach { sourceSet ->
                     currentModules.add(getKotlinModuleId(gradleModule, sourceSet, resolverCtx))
@@ -639,12 +639,12 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
         }
 
         internal fun getSiblingKotlinModuleData(
-            kotlinModule: KotlinModule,
+            kotlinComponent: KotlinComponent,
             gradleModule: IdeaModule,
             ideModule: DataNode<ModuleData>,
             resolverCtx: ProjectResolverContext
         ): DataNode<out ModuleData>? {
-            val usedModuleId = getKotlinModuleId(gradleModule, kotlinModule, resolverCtx)
+            val usedModuleId = getKotlinModuleId(gradleModule, kotlinComponent, resolverCtx)
             return ideModule.findChildModuleById(usedModuleId)
         }
 
@@ -688,8 +688,8 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 null
             }
 
-        private fun getExternalModuleName(gradleModule: IdeaModule, kotlinModule: KotlinModule) =
-            gradleModule.name + ":" + kotlinModule.fullName()
+        private fun getExternalModuleName(gradleModule: IdeaModule, kotlinComponent: KotlinComponent) =
+            gradleModule.name + ":" + kotlinComponent.fullName()
 
         private fun gradlePathToQualifiedName(
             rootName: String,
@@ -704,9 +704,9 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
         private fun getInternalModuleName(
             gradleModule: IdeaModule,
             externalProject: ExternalProject,
-            kotlinModule: KotlinModule,
+            kotlinComponent: KotlinComponent,
             resolverCtx: ProjectResolverContext,
-            actualName: String = kotlinModule.name
+            actualName: String = kotlinComponent.name
         ): String {
             val delimiter: String
             val moduleName = StringBuilder()
@@ -731,7 +731,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 moduleName.append(gradleModule.name)
             }
             moduleName.append(delimiter)
-            moduleName.append(kotlinModule.fullName(actualName))
+            moduleName.append(kotlinComponent.fullName(actualName))
             return PathUtilRt.suggestFileName(moduleName.toString(), true, false)
         }
 
@@ -794,11 +794,11 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
             }
         }
 
-        private val KotlinModule.sourceType
-            get() = if (isTestModule) ExternalSystemSourceType.TEST else ExternalSystemSourceType.SOURCE
+        private val KotlinComponent.sourceType
+            get() = if (isTestComponent) ExternalSystemSourceType.TEST else ExternalSystemSourceType.SOURCE
 
-        private val KotlinModule.resourceType
-            get() = if (isTestModule) ExternalSystemSourceType.TEST_RESOURCE else ExternalSystemSourceType.RESOURCE
+        private val KotlinComponent.resourceType
+            get() = if (isTestComponent) ExternalSystemSourceType.TEST_RESOURCE else ExternalSystemSourceType.RESOURCE
 
         @OptIn(ExperimentalGradleToolingApi::class)
         private fun createSourceSetInfo(
@@ -813,7 +813,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 info.moduleId = getKotlinModuleId(gradleModule, sourceSet, resolverCtx)
                 info.gradleModuleId = getModuleId(resolverCtx, gradleModule)
                 info.actualPlatforms.pushPlatforms(sourceSet.actualPlatforms)
-                info.isTestModule = sourceSet.isTestModule
+                info.isTestModule = sourceSet.isTestComponent
                 info.dependsOn = mppModel.resolveAllDependsOnSourceSets(sourceSet).map { dependsOnSourceSet ->
                     getGradleModuleQualifiedName(resolverCtx, gradleModule, dependsOnSourceSet.name)
                 }
@@ -880,7 +880,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
                 sourceSetInfo.moduleId = getKotlinModuleId(gradleModule, compilation, resolverCtx)
                 sourceSetInfo.gradleModuleId = getModuleId(resolverCtx, gradleModule)
                 sourceSetInfo.actualPlatforms.pushPlatforms(compilation.platform)
-                sourceSetInfo.isTestModule = compilation.isTestModule
+                sourceSetInfo.isTestModule = compilation.isTestComponent
                 sourceSetInfo.dependsOn = compilation.declaredSourceSets.flatMap { it.allDependsOnSourceSets }.map {
                     getGradleModuleQualifiedName(resolverCtx, gradleModule, it)
                 }.distinct().toList()
@@ -922,7 +922,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
         private fun KotlinPlatform.isNotSupported() = IdePlatformKindTooling.getToolingIfAny(this) == null
 
         internal fun KotlinSourceSetInfo.addSourceSets(
-            sourceSets: Collection<KotlinModule>,
+            sourceSets: Collection<KotlinComponent>,
             selfName: String,
             gradleModule: IdeaModule,
             resolverCtx: ProjectResolverContext
@@ -939,13 +939,13 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
             return compilerArguments
         }
 
-        private fun KotlinModule.fullName(simpleName: String = name) = when (this) {
+        private fun KotlinComponent.fullName(simpleName: String = name) = when (this) {
             is KotlinCompilation -> compilationFullName(simpleName, disambiguationClassifier)
             else -> simpleName
         }
 
-        private fun getKotlinModuleId(gradleModule: IdeaModule, kotlinModule: KotlinModule, resolverCtx: ProjectResolverContext) =
-            getGradleModuleQualifiedName(resolverCtx, gradleModule, kotlinModule.fullName())
+        private fun getKotlinModuleId(gradleModule: IdeaModule, kotlinComponent: KotlinComponent, resolverCtx: ProjectResolverContext) =
+            getGradleModuleQualifiedName(resolverCtx, gradleModule, kotlinComponent.fullName())
 
         internal fun getGradleModuleQualifiedName(
             resolverCtx: ProjectResolverContext,
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt
index 10e31eab4507..19f37bb51f8f 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinSourceSetDataService.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.gradle.configuration.kotlinSourceSetData
 import org.jetbrains.kotlin.idea.gradleJava.KotlinGradleFacadeImpl
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
 import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
-import org.jetbrains.kotlin.idea.projectModel.KotlinModule
+import org.jetbrains.kotlin.idea.projectModel.KotlinComponent
 import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
 import org.jetbrains.kotlin.idea.projectModel.KotlinSourceSet
 import org.jetbrains.kotlin.idea.roots.migrateNonJvmSourceFolders
@@ -111,7 +111,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
     }
 
     companion object {
-        private val KotlinModule.kind
+        private val KotlinComponent.kind
             get() = when (this) {
                 is KotlinCompilation -> KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER
                 is KotlinSourceSet -> KotlinModuleKind.SOURCE_SET_HOLDER
@@ -128,7 +128,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
             }
         }
 
-        private fun IdePlatformKind<*>.toSimplePlatforms(
+        private fun IdePlatformKind.toSimplePlatforms(
             moduleData: ModuleData,
             isHmppModule: Boolean,
             projectPlatforms: List<KotlinPlatform>
@@ -215,7 +215,7 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
             kotlinFacet.noVersionAutoAdvance()
 
             with(kotlinFacet.configuration.settings) {
-                kind = kotlinSourceSet.kotlinModule.kind
+                kind = kotlinSourceSet.kotlinComponent.kind
 
                 isTestModule = kotlinSourceSet.isTestModule
                 externalSystemRunTasks = ArrayList(kotlinSourceSet.externalSystemRunTasks)
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentData.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentData.kt
new file mode 100644
index 000000000000..b9ced6b0d880
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentData.kt
@@ -0,0 +1,26 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleJava.configuration.kpm
+
+import com.intellij.openapi.externalSystem.model.Key
+import com.intellij.openapi.externalSystem.model.ProjectKeys
+import com.intellij.openapi.externalSystem.model.project.AbstractNamedData
+import com.intellij.serialization.PropertyMapping
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragmentResolvedDependency
+import org.jetbrains.kotlin.idea.projectModel.KotlinLanguageSettings
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+import org.jetbrains.plugins.gradle.util.GradleConstants
+
+class KotlinFragmentData @PropertyMapping("externalName") constructor(externalName: String) :
+    AbstractNamedData(GradleConstants.SYSTEM_ID, externalName) {
+    var platform: KotlinPlatform = KotlinPlatform.COMMON
+    val refinesFragmentIds: MutableSet<String> = hashSetOf()
+    val resolvedFragmentDependencies: MutableSet<KotlinFragmentResolvedDependency> = hashSetOf()
+    var languageSettings: KotlinLanguageSettings? = null
+
+    companion object {
+        val KEY = Key.create(KotlinFragmentData::class.java, ProjectKeys.MODULE.processingWeight + 1)
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentDataService.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentDataService.kt
new file mode 100644
index 000000000000..e42a645e8764
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentDataService.kt
@@ -0,0 +1,137 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleJava.configuration.kpm
+
+import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.Key
+import com.intellij.openapi.externalSystem.model.ProjectKeys
+import com.intellij.openapi.externalSystem.model.project.ModuleData
+import com.intellij.openapi.externalSystem.model.project.ProjectData
+import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
+import com.intellij.openapi.externalSystem.service.project.manage.AbstractProjectDataService
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.cli.common.arguments.ManualLanguageFeatureSetting
+import org.jetbrains.kotlin.config.LanguageFeature
+import org.jetbrains.kotlin.config.createArguments
+import org.jetbrains.kotlin.idea.caches.project.isKpmModule
+import org.jetbrains.kotlin.idea.caches.project.refinesFragmentIds
+import org.jetbrains.kotlin.idea.configuration.externalCompilerVersion
+import org.jetbrains.kotlin.idea.facet.*
+import org.jetbrains.kotlin.idea.gradleJava.KotlinGradleFacadeImpl.findKotlinPluginVersion
+import org.jetbrains.kotlin.idea.gradleJava.configuration.GradleProjectImportHandler
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+import org.jetbrains.kotlin.idea.roots.findAll
+import org.jetbrains.kotlin.platform.CommonPlatforms
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.js.JsPlatforms
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.platform.konan.NativePlatforms
+import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData
+import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
+import org.jetbrains.plugins.gradle.util.GradleConstants
+import java.io.File
+
+class KotlinFragmentDataService : AbstractProjectDataService<KotlinFragmentData, Void>() {
+    override fun getTargetDataKey(): Key<KotlinFragmentData> = KotlinFragmentData.KEY
+
+    override fun postProcess(
+        toImport: MutableCollection<out DataNode<KotlinFragmentData>>,
+        projectData: ProjectData?,
+        project: Project,
+        modelsProvider: IdeModifiableModelsProvider
+    ) {
+        for (fragmentDataNode in toImport) {
+            val sourceSetDataNode = ExternalSystemApiUtil.findParent(fragmentDataNode, GradleSourceSetData.KEY)
+                ?: error("Failed to find parent GradleSourceSetData for KotlinKPMGradleFragmentData '${fragmentDataNode.data.externalName}'")
+
+            val ideModule = modelsProvider.findIdeModule(sourceSetDataNode.data) ?: continue
+
+            val moduleNode = ExternalSystemApiUtil.findParent(sourceSetDataNode, ProjectKeys.MODULE) ?: continue
+            configureFacetByFragmentData(ideModule, modelsProvider, moduleNode, sourceSetDataNode, fragmentDataNode)?.also { kotlinFacet ->
+                GradleProjectImportHandler.getInstances(project).forEach { it.importBySourceSet(kotlinFacet, sourceSetDataNode) }
+            }
+        }
+    }
+
+    companion object {
+        private fun KotlinFacet.configureFacet(
+            compilerVersion: String?,
+            platform: TargetPlatform?, // if null, detect by module dependencies
+            modelsProvider: IdeModifiableModelsProvider,
+        ) {
+            val module = module
+            with(configuration.settings) {
+                compilerArguments = null
+                targetPlatform = null
+                compilerSettings = null
+                initializeIfNeeded(
+                    module,
+                    modelsProvider.getModifiableRootModel(module),
+                    platform,
+                    compilerVersion
+                )
+                val apiLevel = apiLevel
+                val languageLevel = languageLevel
+                if (languageLevel != null && apiLevel != null && apiLevel > languageLevel) {
+                    this.apiLevel = languageLevel
+                }
+            }
+
+            module.externalCompilerVersion = compilerVersion
+        }
+
+        private fun configureFacetByFragmentData(
+            ideModule: Module,
+            modelsProvider: IdeModifiableModelsProvider,
+            moduleNode: DataNode<ModuleData>,
+            sourceSetNode: DataNode<GradleSourceSetData>,
+            fragmentDataNode: DataNode<KotlinFragmentData>
+        ): KotlinFacet? {
+
+            val compilerVersion = moduleNode.findAll(BuildScriptClasspathData.KEY).firstOrNull()?.data?.let(::findKotlinPluginVersion)
+                ?: return null
+
+            val platform = when (fragmentDataNode.data.platform) {
+                KotlinPlatform.COMMON -> CommonPlatforms.defaultCommonPlatform
+                KotlinPlatform.JVM, KotlinPlatform.ANDROID -> JvmPlatforms.defaultJvmPlatform
+                KotlinPlatform.JS -> JsPlatforms.defaultJsPlatform
+                KotlinPlatform.NATIVE -> NativePlatforms.unspecifiedNativePlatform
+            }
+
+            val languageSettings = fragmentDataNode.data.languageSettings
+
+            val compilerArguments = platform.createArguments {
+                multiPlatform = true
+                languageSettings?.also {
+                    languageVersion = it.languageVersion
+                    apiVersion = it.apiVersion
+                    progressiveMode = it.isProgressiveMode
+                    internalArguments = it.enabledLanguageFeatures.mapNotNull {
+                        val feature = LanguageFeature.fromString(it) ?: return@mapNotNull null
+                        val arg = "-XXLanguage:+$it"
+                        ManualLanguageFeatureSetting(feature, LanguageFeature.State.ENABLED, arg)
+                    }
+                    optIn = it.optInAnnotationsInUse.toTypedArray()
+                    pluginOptions = it.compilerPluginArguments
+                    pluginClasspaths = it.compilerPluginClasspath.map(File::getPath).toTypedArray()
+                    freeArgs = it.freeCompilerArgs.toMutableList()
+                }
+            }
+
+            val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false, GradleConstants.SYSTEM_ID.id)
+            kotlinFacet.configureFacet(
+                compilerVersion,
+                platform,
+                modelsProvider,
+            )
+
+            ideModule.hasExternalSdkConfiguration = sourceSetNode.data.sdkName != null
+            ideModule.isKpmModule = true
+            ideModule.refinesFragmentIds = fragmentDataNode.data.refinesFragmentIds.toList()
+            applyCompilerArgumentsToFacet(compilerArguments, platform.createArguments(), kotlinFacet, modelsProvider)
+            kotlinFacet.noVersionAutoAdvance()
+            return kotlinFacet
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentUtil.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentUtil.kt
new file mode 100644
index 000000000000..29a706ef1f47
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinFragmentUtil.kt
@@ -0,0 +1,29 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+
+package org.jetbrains.kotlin.idea.gradleJava.configuration.kpm
+
+import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType
+import org.gradle.tooling.model.idea.IdeaModule
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragment
+import org.jetbrains.kotlin.idea.projectModel.KotlinKPMModule
+import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
+import org.jetbrains.plugins.gradle.service.project.GradleProjectResolverUtil
+import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+
+
+private val KotlinFragment.fullName
+    get() = fragmentName + (moduleIdentifier.moduleClassifier ?: KotlinKPMModule.MAIN_MODULE_NAME).capitalizeAsciiOnly()
+
+internal fun calculateKotlinFragmentModuleId(
+    gradleModule: IdeaModule,
+    fragment: KotlinFragment,
+    resolverCtx: ProjectResolverContext
+): String =
+    GradleProjectResolverUtil.getModuleId(resolverCtx, gradleModule) + ":" + fragment.fullName
+
+fun KotlinFragment.computeSourceType(): ExternalSystemSourceType =
+    if (isTestFragment) ExternalSystemSourceType.TEST else ExternalSystemSourceType.SOURCE
+
+fun KotlinFragment.computeResourceType(): ExternalSystemSourceType =
+    if (isTestFragment) ExternalSystemSourceType.TEST_RESOURCE else ExternalSystemSourceType.RESOURCE
+
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMGradleProjectResolver.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMGradleProjectResolver.kt
new file mode 100644
index 000000000000..36c8c00635a9
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMGradleProjectResolver.kt
@@ -0,0 +1,246 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleJava.configuration.kpm
+
+import com.intellij.build.events.MessageEvent
+import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.ProjectKeys
+import com.intellij.openapi.externalSystem.model.project.*
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
+import com.intellij.openapi.externalSystem.util.ExternalSystemConstants
+import com.intellij.openapi.externalSystem.util.Order
+import com.intellij.openapi.roots.DependencyScope
+import com.intellij.util.PlatformUtils
+import org.gradle.tooling.model.idea.IdeaModule
+import org.jetbrains.kotlin.idea.PlatformVersion
+import org.jetbrains.kotlin.idea.configuration.multiplatform.KotlinMultiplatformNativeDebugSuggester
+import org.jetbrains.kotlin.idea.gradle.configuration.ResolveModulesPerSourceSetInMppBuildIssue
+import org.jetbrains.kotlin.idea.gradle.configuration.buildClasspathData
+import org.jetbrains.kotlin.idea.gradle.configuration.findChildModuleById
+import org.jetbrains.kotlin.idea.gradle.ui.notifyLegacyIsResolveModulePerSourceSetSettingIfNeeded
+import org.jetbrains.kotlin.idea.gradleTooling.*
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragment
+import org.jetbrains.kotlin.idea.roots.findAll
+import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData
+import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
+import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
+import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+import org.jetbrains.plugins.gradle.util.GradleConstants
+import java.io.File
+import java.lang.reflect.Proxy
+
+@Order(ExternalSystemConstants.UNORDERED + 1)
+open class KotlinKPMGradleProjectResolver : AbstractProjectResolverExtension() {
+    override fun getExtraProjectModelClasses(): Set<Class<out Any>> = setOf(KotlinKPMGradleModel::class.java)
+    override fun getToolingExtensionsClasses(): Set<Class<out Any>> = setOf(KotlinKPMGradleModelBuilder::class.java, Unit::class.java)
+
+    override fun populateModuleExtraModels(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
+        if (ExternalSystemApiUtil.find(ideModule, BuildScriptClasspathData.KEY) == null) {
+            val buildScriptClasspathData = buildClasspathData(gradleModule, resolverCtx)
+            ideModule.createChild(BuildScriptClasspathData.KEY, buildScriptClasspathData)
+        }
+
+        super.populateModuleExtraModels(gradleModule, ideModule)
+    }
+
+    override fun createModule(gradleModule: IdeaModule, projectDataNode: DataNode<ProjectData>): DataNode<ModuleData>? {
+        return super.createModule(gradleModule, projectDataNode)?.also {
+            val model = getModelOrNull(gradleModule) ?: return@also
+            KotlinKPMModuleDataInitializer(model).doInitialize(gradleModule, it, projectDataNode, resolverCtx)
+        }
+    }
+
+    override fun populateModuleContentRoots(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
+        if (!modelExists(gradleModule)) {
+            return super.populateModuleContentRoots(gradleModule, ideModule)
+        }
+        nativeDebugSuggester.suggestNativeDebug(getModelOrNull(gradleModule), resolverCtx)
+
+        if (!resolverCtx.isResolveModulePerSourceSet && !PlatformVersion.isAndroidStudio() && !PlatformUtils.isMobileIde() &&
+            !PlatformUtils.isAppCode()
+        ) {
+            notifyLegacyIsResolveModulePerSourceSetSettingIfNeeded(resolverCtx.projectPath)
+            resolverCtx.report(MessageEvent.Kind.WARNING, ResolveModulesPerSourceSetInMppBuildIssue())
+        }
+
+        val sourceSetsMap = ExternalSystemApiUtil.findAll(ideModule, GradleSourceSetData.KEY).filter {
+            ExternalSystemApiUtil.find(it, KotlinFragmentData.KEY) != null
+        }.associateBy { it.data.id }
+        val model = resolverCtx.getKpmModel(gradleModule)!!
+
+        for (fragment in model.kpmModules.flatMap { it.fragments }) {
+            val moduleId = calculateKotlinFragmentModuleId(gradleModule, fragment, resolverCtx)
+            val moduleDataNode = sourceSetsMap[moduleId]
+            if (moduleDataNode == null) continue
+
+            createContentRootData(
+                extractSourceDirs(fragment),
+                fragment.computeSourceType(),
+                extractPackagePrefix(fragment),
+                moduleDataNode
+            )
+            createContentRootData(
+                extractResourceDirs(fragment),
+                fragment.computeResourceType(),
+                null,
+                moduleDataNode
+            )
+        }
+
+        gradleModule.contentRoots.mapNotNull {
+            val gradleContentRoot = it ?: return@mapNotNull null
+            val rootDirectory = it.rootDirectory ?: return@mapNotNull null
+            ContentRootData(GradleConstants.SYSTEM_ID, rootDirectory.absolutePath).also { ideContentRoot ->
+                (gradleContentRoot.excludeDirectories ?: emptySet()).forEach { file ->
+                    ideContentRoot.storePath(ExternalSystemSourceType.EXCLUDED, file.absolutePath)
+                }
+            }
+        }.forEach { ideModule.createChild(ProjectKeys.CONTENT_ROOT, it) }
+    }
+
+    override fun populateModuleDependencies(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>, ideProject: DataNode<ProjectData>) {
+        if (!modelExists(gradleModule)) {
+            return super.populateModuleDependencies(gradleModule, ideModule, ideProject)
+        }
+        populateDependenciesByFragmentData(ideModule, ideProject)
+    }
+
+    private fun modelExists(gradleModule: IdeaModule): Boolean = getModelOrNull(gradleModule) != null
+    private fun getModelOrNull(gradleModule: IdeaModule): KotlinKPMGradleModel? = resolverCtx.getKpmModel(gradleModule)
+
+    companion object {
+        private val nativeDebugSuggester = object : KotlinMultiplatformNativeDebugSuggester<KotlinKPMGradleModel>() {
+            override fun hasKotlinNativeHome(model: KotlinKPMGradleModel?): Boolean = model?.kotlinNativeHome?.isNotEmpty() ?: false
+        }
+
+        fun ProjectResolverContext.getKpmModel(gradleModule: IdeaModule): KotlinKPMGradleModel? {
+            return when (val kpmModel = this.getExtraProject(gradleModule, KotlinKPMGradleModel::class.java)) {
+                is Proxy? -> kpmModel?.let { kotlinKpmModel ->
+                    KotlinKPMGradleModelImpl(
+                        kpmModules = kotlinKpmModel.kpmModules,
+                        settings = kotlinKpmModel.settings,
+                        kotlinNativeHome = kotlinKpmModel.kotlinNativeHome,
+                    )
+                }
+                else -> kpmModel
+            }
+        }
+
+
+        private fun createContentRootData(
+            sourceDirs: Set<File>,
+            sourceType: ExternalSystemSourceType,
+            packagePrefix: String?,
+            parentNode: DataNode<*>
+        ) {
+            for (sourceDir in sourceDirs) {
+                val contentRootData = ContentRootData(GradleConstants.SYSTEM_ID, sourceDir.absolutePath)
+                packagePrefix?.also {
+                    contentRootData.storePath(sourceType, sourceDir.absolutePath, it)
+                } ?: contentRootData.storePath(sourceType, sourceDir.absolutePath)
+                parentNode.createChild(ProjectKeys.CONTENT_ROOT, contentRootData)
+            }
+        }
+
+        //TODO check this
+        private fun extractPackagePrefix(fragment: KotlinFragment): String? = null
+        private fun extractSourceDirs(fragment: KotlinFragment): Set<File> = fragment.sourceDirs
+        private fun extractResourceDirs(fragment: KotlinFragment): Set<File> = fragment.resourceDirs
+        private fun extractContentRootSources(multiplatformModel: KotlinKPMGradleModel): Collection<KotlinFragment> =
+            multiplatformModel.kpmModules.flatMap { it.fragments }
+
+        //TODO replace with proper implementation, like with KotlinTaskProperties
+        private fun extractPureKotlinSourceFolders(fragment: KotlinFragment): Collection<File> = fragment.sourceDirs.toList()
+
+        //TODO Unite with KotlinGradleProjectResolverExtension.getSourceSetName
+        private val KotlinKPMGradleModel.pureKotlinSourceFolders: Collection<String>
+            get() = extractContentRootSources(this).flatMap { extractPureKotlinSourceFolders(it) }.map { it.absolutePath }
+
+        private val DataNode<out ModuleData>.sourceSetName
+            get() = (data as? GradleSourceSetData)?.id?.substringAfterLast(':')
+
+        //TODO Unite with KotlinGradleProjectResolverExtension.addDependency
+        private fun addModuleDependency(
+            dependentModule: DataNode<out ModuleData>,
+            dependencyModule: DataNode<out ModuleData>,
+            isPropagated: Boolean = false
+        ) {
+            val moduleDependencyData = ModuleDependencyData(dependentModule.data, dependencyModule.data)
+            //TODO Replace with proper scope from dependency
+            moduleDependencyData.scope = if (isPropagated) DependencyScope.PROVIDED else DependencyScope.COMPILE
+            moduleDependencyData.isExported = false
+            moduleDependencyData.isProductionOnTestDependency = dependencyModule.sourceSetName == "test"
+            dependentModule.createChild(ProjectKeys.MODULE_DEPENDENCY, moduleDependencyData)
+        }
+
+        private fun populateDependenciesByFragmentData(
+            ideModule: DataNode<ModuleData>,
+            ideProject: DataNode<ProjectData>
+        ) {
+            val allModules = ExternalSystemApiUtil.findAll(ideProject, ProjectKeys.MODULE)
+
+            val sourceSetDataWithFragmentData = ExternalSystemApiUtil.findAll(ideModule, GradleSourceSetData.KEY)
+                .mapNotNull { ExternalSystemApiUtil.find(it, KotlinFragmentData.KEY)?.data?.let { fragmentData -> it to fragmentData } }
+                .sortedBy { it.second.refinesFragmentIds.size }
+            for ((fragmentSourceSetNode, kpmFragmentData) in sourceSetDataWithFragmentData) {
+
+                val refinesFragmentNodes = kpmFragmentData.refinesFragmentIds.mapNotNull { ideModule.findChildModuleById(it) }
+                refinesFragmentNodes.forEach {
+                    addModuleDependency(fragmentSourceSetNode, it)
+                }
+
+                //TODO asymptotic
+                kpmFragmentData.resolvedFragmentDependencies.forEach { dependency ->
+                    when (dependency) {
+                        is KotlinFragmentResolvedSourceDependency -> {
+                            val resolvedLocalFragmentSourceSetsDataNode = allModules.mapNotNull { node ->
+                                node.findChildModuleById(dependency.dependencyIdentifier)
+                            }.single()
+                            addModuleDependency(fragmentSourceSetNode, resolvedLocalFragmentSourceSetsDataNode)
+                        }
+                        is KotlinFragmentResolvedBinaryDependency -> populateLibraryDependency(
+                            fragmentSourceSetNode,
+                            ideProject,
+                            dependency
+                        )
+                    }
+                }
+                //Propagation of ModuleDependencyData through refines edges
+                val moduleDependencies = ExternalSystemApiUtil.findAll(fragmentSourceSetNode, ProjectKeys.MODULE_DEPENDENCY)
+                    .map { it.data.target }
+                val moduleDependenciesToBePropagated = refinesFragmentNodes.flatMap { refinesModuleDep ->
+                    ExternalSystemApiUtil.findAll(refinesModuleDep, ProjectKeys.MODULE_DEPENDENCY)
+                }.filter { it.data.target !in moduleDependencies }
+                    .filterNotNull()
+                    .distinct()
+                    .map { it.data.target }
+
+                val nodesToBePropagated = moduleDependenciesToBePropagated.mapNotNull {
+                    ideModule.findChildModuleById(it.id)
+                }
+                nodesToBePropagated.forEach { addModuleDependency(fragmentSourceSetNode, it, isPropagated = true) }
+            }
+        }
+
+        private fun populateLibraryDependency(
+            dependentModule: DataNode<out ModuleData>,
+            projectDataNode: DataNode<out ProjectData>,
+            moduleDependency: KotlinFragmentResolvedBinaryDependency
+        ) {
+            val existingLibraryNodeWithData = projectDataNode.findAll(ProjectKeys.LIBRARY).find {
+                it.data.owner == GradleConstants.SYSTEM_ID && it.data.externalName == moduleDependency.dependencyIdentifier
+            }
+            val libraryData: LibraryData
+            if (existingLibraryNodeWithData != null) {
+                libraryData = existingLibraryNodeWithData.data
+            } else {
+                libraryData = LibraryData(GradleConstants.SYSTEM_ID, moduleDependency.dependencyIdentifier)
+                moduleDependency.dependencyContent?.forEach { libraryData.addPath(LibraryPathType.BINARY, it.absolutePath) }
+                projectDataNode.createChild(ProjectKeys.LIBRARY, libraryData)
+            }
+
+            val libraryDependencyData = LibraryDependencyData(dependentModule.data, libraryData, LibraryLevel.PROJECT)
+            dependentModule.createChild(ProjectKeys.LIBRARY_DEPENDENCY, libraryDependencyData)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMModuleDataInitializer.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMModuleDataInitializer.kt
new file mode 100644
index 000000000000..d3fe0197aae9
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/kpm/KotlinKPMModuleDataInitializer.kt
@@ -0,0 +1,247 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleJava.configuration.kpm
+
+import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.project.ModuleData
+import com.intellij.openapi.externalSystem.model.project.ProjectData
+import com.intellij.openapi.externalSystem.model.project.ProjectId
+import com.intellij.openapi.util.text.StringUtil
+import com.intellij.util.PathUtilRt
+import org.gradle.tooling.model.UnsupportedMethodException
+import org.gradle.tooling.model.idea.IdeaModule
+import org.jetbrains.kotlin.idea.configuration.multiplatform.ComposableInitializeModuleDataAction
+import org.jetbrains.kotlin.idea.configuration.multiplatform.InitializeModuleDataContext
+import org.jetbrains.kotlin.idea.configuration.multiplatform.ModuleDataInitializer
+import org.jetbrains.kotlin.idea.gradle.configuration.findChildModuleById
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinKPMGradleModel
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragment
+import org.jetbrains.kotlin.idea.projectModel.KotlinKPMModule
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+import org.jetbrains.kotlin.idea.projectModel.KotlinVariant
+import org.jetbrains.kotlin.idea.roots.findAll
+import org.jetbrains.plugins.gradle.model.*
+import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
+import org.jetbrains.plugins.gradle.service.project.GradleProjectResolver
+import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+import java.util.*
+import java.util.stream.Collectors
+
+class KotlinKPMModuleDataInitializer(private val model: KotlinKPMGradleModel) : ModuleDataInitializer {
+    private val initializeModuleDataContext: InitializeModuleDataContext<KotlinFragment> = InitializeModuleDataContext()
+
+    override fun doInitialize(
+        gradleModule: IdeaModule,
+        mainModuleNode: DataNode<ModuleData>,
+        projectDataNode: DataNode<ProjectData>,
+        resolverCtx: ProjectResolverContext
+    ) {
+        (initializeBasicModuleDataAction
+                + createGradleSourceSetData
+                + createKpmFragmentData
+                + initializeModuleNodeDataAction
+                ).doInitialize(gradleModule, mainModuleNode, projectDataNode, resolverCtx)
+    }
+
+    private val initializeBasicModuleDataAction = object : ComposableInitializeModuleDataAction {
+        override fun doInitialize(
+            gradleModule: IdeaModule,
+            mainModuleNode: DataNode<ModuleData>,
+            projectDataNode: DataNode<ProjectData>,
+            resolverCtx: ProjectResolverContext
+        ) {
+            initializeModuleDataContext.mainModuleData = mainModuleNode.data
+            initializeModuleDataContext.mainModuleConfigPath = initializeModuleDataContext.mainModuleData.linkedExternalProjectPath
+            initializeModuleDataContext.mainModuleFileDirectoryPath = initializeModuleDataContext.mainModuleData.moduleFileDirectoryPath
+            initializeModuleDataContext.jdkName = gradleModule.jdkNameIfAny
+
+            initializeModuleDataContext.moduleGroup = if (!resolverCtx.isUseQualifiedModuleNames) {
+                val gradlePath = gradleModule.gradleProject.path
+                val isRootModule = gradlePath.isEmpty() || gradlePath == ":"
+                if (isRootModule) {
+                    arrayOf(initializeModuleDataContext.mainModuleData.internalName)
+                } else {
+                    gradlePath.split(":").drop(1).toTypedArray()
+                }
+            } else null
+        }
+    }
+
+    private val initializeModuleNodeDataAction = object : ComposableInitializeModuleDataAction {
+        override fun doInitialize(
+            gradleModule: IdeaModule,
+            mainModuleNode: DataNode<ModuleData>,
+            projectDataNode: DataNode<ProjectData>,
+            resolverCtx: ProjectResolverContext
+        ) {
+            val mainModuleData = mainModuleNode.data
+            with(projectDataNode.data) {
+                if (mainModuleData.linkedExternalProjectPath == linkedExternalProjectPath) {
+                    group = mainModuleData.group
+                    version = mainModuleData.version
+                }
+            }
+        }
+    }
+
+    private val createGradleSourceSetData = object : ComposableInitializeModuleDataAction {
+        override fun doInitialize(
+            gradleModule: IdeaModule,
+            mainModuleNode: DataNode<ModuleData>,
+            projectDataNode: DataNode<ProjectData>,
+            resolverCtx: ProjectResolverContext
+        ) {
+            val sourceSetMap = projectDataNode.getUserData(GradleProjectResolver.RESOLVED_SOURCE_SETS)!!
+            val externalProject = resolverCtx.getExtraProject(gradleModule, ExternalProject::class.java)!!
+
+            val fragmentsByModules = model.kpmModules.associateWith { it.fragments }
+
+            for ((module, fragments) in fragmentsByModules) {
+                for (fragment in fragments) {
+                    val moduleId = calculateKotlinFragmentModuleId(gradleModule, fragment, resolverCtx)
+                    val existingSourceSetDataNode = sourceSetMap[moduleId]?.first
+
+                    val moduleExternalName = calculateFragmentExternalModuleName(gradleModule, fragment)
+                    val moduleInternalName = calculateFragmentInternalModuleName(
+                        gradleModule,
+                        externalProject,
+                        fragment,
+                        resolverCtx,
+                    )
+
+                    val fragmentData = existingSourceSetDataNode?.data ?: GradleSourceSetData(
+                        moduleId,
+                        moduleExternalName,
+                        moduleInternalName,
+                        initializeModuleDataContext.mainModuleFileDirectoryPath,
+                        initializeModuleDataContext.mainModuleConfigPath
+                    ).also {
+                        it.group = externalProject.group
+                        it.version = externalProject.version
+
+                        when (module.moduleIdentifier.moduleClassifier) {
+                            KotlinKPMModule.MAIN_MODULE_NAME -> {
+                                it.publication = ProjectId(externalProject.group, externalProject.name, externalProject.version)
+                            }
+
+                            KotlinKPMModule.TEST_MODULE_NAME -> {
+                                it.productionModuleId = moduleInternalName
+                            }
+                        }
+
+                        it.ideModuleGroup = initializeModuleDataContext.moduleGroup
+                        it.sdkName = initializeModuleDataContext.jdkName
+                    }
+
+                    if (existingSourceSetDataNode == null) {
+                        val fragmentDataNode = mainModuleNode.createChild(GradleSourceSetData.KEY, fragmentData)
+                        sourceSetMap[moduleId] = com.intellij.openapi.util.Pair(
+                            fragmentDataNode,
+                            createExternalSourceSet(fragment, fragmentData)
+                        )
+                    }
+                }
+            }
+        }
+
+        private fun calculateFragmentExternalModuleName(gradleModule: IdeaModule, fragment: KotlinFragment): String =
+            "${gradleModule.name}:${fragment.moduleIdentifier.moduleClassifier ?: KotlinKPMModule.MAIN_MODULE_NAME}.${fragment.fragmentName}"
+
+        private fun calculateFragmentInternalModuleName(
+            gradleModule: IdeaModule,
+            externalProject: ExternalProject,
+            fragment: KotlinFragment,
+            resolverCtx: ProjectResolverContext,
+        ): String {
+            val delimiter: String
+            val moduleName = StringBuilder()
+
+            val buildSrcGroup = resolverCtx.buildSrcGroup
+            if (resolverCtx.isUseQualifiedModuleNames) {
+                delimiter = "."
+                if (StringUtil.isNotEmpty(buildSrcGroup)) {
+                    moduleName.append(buildSrcGroup).append(delimiter)
+                }
+                moduleName.append(gradlePathToQualifiedName(gradleModule.project.name, externalProject.qName))
+            } else {
+                delimiter = "_"
+                if (StringUtil.isNotEmpty(buildSrcGroup)) {
+                    moduleName.append(buildSrcGroup).append(delimiter)
+                }
+                moduleName.append(gradleModule.name)
+            }
+            moduleName.append(delimiter)
+            moduleName.append("${fragment.moduleIdentifier.moduleClassifier ?: KotlinKPMModule.MAIN_MODULE_NAME}.${fragment.fragmentName}")
+            return PathUtilRt.suggestFileName(moduleName.toString(), true, false)
+        }
+
+        private fun gradlePathToQualifiedName(
+            rootName: String,
+            gradlePath: String
+        ): String = ((if (gradlePath.startsWith(":")) "$rootName." else "")
+                + Arrays.stream(gradlePath.split(":".toRegex()).toTypedArray())
+            .filter { s: String -> s.isNotEmpty() }
+            .collect(Collectors.joining(".")))
+
+        private fun createExternalSourceSet(
+            fragment: KotlinFragment,
+            gradleSourceSetData: GradleSourceSetData,
+        ): ExternalSourceSet {
+            return DefaultExternalSourceSet().also { sourceSet ->
+                sourceSet.name = fragment.fragmentName
+                sourceSet.targetCompatibility = gradleSourceSetData.targetCompatibility
+                //TODO compute it properly (if required)
+                sourceSet.dependencies += emptyList<ExternalDependency>()
+
+                sourceSet.setSources(linkedMapOf(
+                    fragment.computeSourceType() to DefaultExternalSourceDirectorySet().also { dirSet ->
+                        dirSet.srcDirs = fragment.sourceDirs
+                    },
+                    fragment.computeResourceType() to DefaultExternalSourceDirectorySet().also { dirSet ->
+                        dirSet.srcDirs = fragment.resourceDirs
+                    }
+                ).toMap())
+            }
+        }
+
+    }
+
+    private val createKpmFragmentData = object : ComposableInitializeModuleDataAction {
+        override fun doInitialize(
+            gradleModule: IdeaModule,
+            mainModuleNode: DataNode<ModuleData>,
+            projectDataNode: DataNode<ProjectData>,
+            resolverCtx: ProjectResolverContext
+        ) {
+            model.kpmModules.flatMap { it.fragments }.forEach { fragment ->
+                val moduleId = calculateKotlinFragmentModuleId(gradleModule, fragment, resolverCtx)
+                val fragmentGradleSourceSetDataNode = mainModuleNode.findChildModuleById(moduleId)
+                    ?: error("Cannot find GradleSourceSetData node for fragment '$moduleId'")
+
+                if (fragmentGradleSourceSetDataNode.findAll(KotlinFragmentData.KEY).isNotEmpty()) return@forEach
+                val refinesFragmentsIds = fragment.directRefinesFragments.map {
+                    calculateKotlinFragmentModuleId(gradleModule, it, resolverCtx)
+                }
+
+                KotlinFragmentData(moduleId).apply {
+                    if (fragment is KotlinVariant) {
+                        platform = fragment.variantAttributes.values.mapNotNull { KotlinPlatform.byId(it) }.singleOrNull() ?: platform
+                    }
+                    refinesFragmentIds.addAll(refinesFragmentsIds)
+                    resolvedFragmentDependencies.addAll(fragment.resolvedDependencies)
+                    languageSettings = fragment.languageSettings
+                    fragmentGradleSourceSetDataNode.createChild(KotlinFragmentData.KEY, this)
+                }
+            }
+        }
+    }
+
+
+    companion object {
+        private val IdeaModule.jdkNameIfAny
+            get() = try {
+                jdkName
+            } catch (e: UnsupportedMethodException) {
+                null
+            }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/KotlinMppPopulateModuleDependenciesContext.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/KotlinMppPopulateModuleDependenciesContext.kt
index 0e4fbd430746..185c2f2f977c 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/KotlinMppPopulateModuleDependenciesContext.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/KotlinMppPopulateModuleDependenciesContext.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.gradleJava.configuration.getMppModel
 import org.jetbrains.kotlin.idea.gradleJava.configuration.klib.KotlinNativeLibrariesDependencySubstitutor
 import org.jetbrains.kotlin.idea.gradleTooling.*
 import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
-import org.jetbrains.kotlin.idea.projectModel.KotlinModule
+import org.jetbrains.kotlin.idea.projectModel.KotlinComponent
 import org.jetbrains.kotlin.idea.projectModel.KotlinSourceSet
 import org.jetbrains.plugins.gradle.model.ExternalSourceSet
 import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
@@ -64,7 +64,7 @@ fun createKotlinMppPopulateModuleDependenciesContext(
     )
 }
 
-fun KotlinMppPopulateModuleDependenciesContext.getDependencies(module: KotlinModule): List<KotlinDependency> {
+fun KotlinMppPopulateModuleDependenciesContext.getDependencies(module: KotlinComponent): List<KotlinDependency> {
     return dependenciesPreprocessor(module.dependencies.mapNotNull { id -> mppModel.dependencyMap[id] })
 }
 
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesByCompilations.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesByCompilations.kt
index cae73462b9ab..1116de12b861 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesByCompilations.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesByCompilations.kt
@@ -18,7 +18,7 @@ internal fun KotlinMPPGradleProjectResolver.Companion.populateModuleDependencies
             for (sourceSet in compilation.declaredSourceSets) {
                 if (sourceSet.fullName() == compilation.fullName()) continue
                 val targetDataNode = getSiblingKotlinModuleData(sourceSet, gradleModule, ideModule, resolverCtx) ?: continue
-                addDependency(dataNode, targetDataNode, sourceSet.isTestModule)
+                addDependency(dataNode, targetDataNode, sourceSet.isTestComponent)
             }
         }
 
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesBySourceSetVisibilityGraph.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesBySourceSetVisibilityGraph.kt
index c0e227fa5c95..c0bf0f2df835 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesBySourceSetVisibilityGraph.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/mpp/populateModuleDependenciesBySourceSetVisibilityGraph.kt
@@ -37,7 +37,7 @@ internal fun KotlinMPPGradleProjectResolver.Companion.populateModuleDependencies
         /* Add dependencies from current sourceSet to all visible source sets (dependsOn, test to production, ...)*/
         for (visibleSourceSet in visibleSourceSets) {
             val toDataNode = getSiblingKotlinModuleData(visibleSourceSet, gradleModule, ideModule, resolverCtx) ?: continue
-            addDependency(fromDataNode, toDataNode, visibleSourceSet.isTestModule)
+            addDependency(fromDataNode, toDataNode, visibleSourceSet.isTestComponent)
         }
 
         if (!processedModuleIds.add(getKotlinModuleId(gradleModule, sourceSet, resolverCtx))) continue
@@ -212,14 +212,14 @@ private fun KotlinMPPGradleProjectResolver.Companion.populateSourceSetInfos(
     val dependeeSourceSets = closedSourceSetGraph.successors(sourceSet)
     val sourceSetInfos = if (isAndroid) {
         ideModule.kotlinAndroidSourceSets?.filter {
-            (it.kotlinModule as? KotlinCompilation)?.declaredSourceSets?.contains(sourceSet) ?: false
+          (it.kotlinComponent as? KotlinCompilation)?.declaredSourceSets?.contains(sourceSet) ?: false
         } ?: emptyList()
     } else {
         listOfNotNull(fromDataNode.kotlinSourceSetData?.sourceSetInfo)
     }
     for (sourceSetInfo in sourceSetInfos) {
-        if (sourceSetInfo.kotlinModule is KotlinCompilation) {
-            val selfName = sourceSetInfo.kotlinModule.fullName()
+        if (sourceSetInfo.kotlinComponent is KotlinCompilation) {
+            val selfName = sourceSetInfo.kotlinComponent.fullName()
             sourceSetInfo.addSourceSets(dependeeSourceSets, selfName, gradleModule, resolverCtx)
         }
     }
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/KotlinMultiplatformNativeDebugSuggester.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/KotlinMultiplatformNativeDebugSuggester.kt
new file mode 100644
index 000000000000..071c3bfe0485
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/KotlinMultiplatformNativeDebugSuggester.kt
@@ -0,0 +1,74 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.configuration.multiplatform
+
+import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.ide.util.PropertiesComponent
+import com.intellij.notification.Notification
+import com.intellij.notification.NotificationAction
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.extensions.PluginId
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.installAndEnable
+import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.notificationGroup
+import com.intellij.util.PlatformUtils
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.kotlin.idea.gradle.KotlinIdeaGradleBundle
+import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+
+abstract class KotlinMultiplatformNativeDebugSuggester<TModel> {
+    fun suggestNativeDebug(model: TModel?, resolverCtx: ProjectResolverContext) {
+        if (!nativeDebugAdvertised && hasKotlinNativeHome(model)) {
+            nativeDebugAdvertised = true
+            suggestNativeDebug(resolverCtx.projectPath)
+        }
+    }
+
+    protected abstract fun hasKotlinNativeHome(model: TModel?): Boolean
+
+    companion object {
+        private var nativeDebugAdvertised = false
+
+        private var isNativeDebugSuggestionEnabled
+            get() = PropertiesComponent.getInstance().getBoolean("isNativeDebugSuggestionEnabled", true)
+            set(value) {
+                PropertiesComponent.getInstance().setValue("isNativeDebugSuggestionEnabled", value)
+            }
+
+        private fun suggestNativeDebug(projectPath: String) {
+            if (!PlatformUtils.isIdeaUltimate()) return
+
+            val pluginId = PluginId.getId("com.intellij.nativeDebug")
+            if (PluginManagerCore.isPluginInstalled(pluginId)) return
+
+            if (!isNativeDebugSuggestionEnabled) return
+
+            val projectManager = ProjectManager.getInstance()
+            val project = projectManager.openProjects.firstOrNull { it.basePath == projectPath } ?: return
+
+            notificationGroup
+                .createNotification(
+                    KotlinIdeaGradleBundle.message("notification.title.plugin.suggestion"),
+                    KotlinIdeaGradleBundle.message("notification.text.native.debug.provides.debugger.for.kotlin.native"),
+                    NotificationType.INFORMATION
+                )
+                .addAction(object : NotificationAction(KotlinIdeaGradleBundle.message("action.text.install")) {
+                    override fun actionPerformed(e: AnActionEvent, notification: Notification) {
+                        installAndEnable(project, setOf<@NotNull PluginId>(pluginId), true) { notification.expire() }
+                    }
+                })
+                .addAction(object : NotificationAction(KotlinIdeaGradleBundle.message("action.text.dontShowAgain")) {
+                    override fun actionPerformed(e: AnActionEvent, notification: Notification) {
+                        isNativeDebugSuggestionEnabled = false
+                        notification.expire()
+                    }
+                })
+                .notify(project)
+        }
+    }
+}
+
+//object KotlinMPPNativeDebugSuggester : KotlinMultiplatformNativeDebugSuggester<KotlinMPPGradleModel>() {
+//    override fun hasKotlinNativeHome(multiplatformModel: KotlinMPPGradleModel?): Boolean =
+//        multiplatformModel?.kotlinNativeHome?.isNotEmpty() ?: false
+//}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/ModuleDataInitializer.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/ModuleDataInitializer.kt
new file mode 100644
index 000000000000..1ec6a659afc5
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/multiplatform/ModuleDataInitializer.kt
@@ -0,0 +1,45 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.configuration.multiplatform
+
+import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.project.ModuleData
+import com.intellij.openapi.externalSystem.model.project.ProjectData
+import org.gradle.tooling.model.idea.IdeaModule
+import org.jetbrains.kotlin.config.ExternalSystemRunTask
+import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
+
+interface ModuleDataInitializer {
+    fun doInitialize(
+        gradleModule: IdeaModule,
+        mainModuleNode: DataNode<ModuleData>,
+        projectDataNode: DataNode<ProjectData>,
+        resolverCtx: ProjectResolverContext
+    )
+}
+
+interface ComposableInitializeModuleDataAction : ModuleDataInitializer {
+    private fun composeWith(lazyAfter: () -> ModuleDataInitializer): ComposableInitializeModuleDataAction =
+        object : ComposableInitializeModuleDataAction {
+            override fun doInitialize(
+                gradleModule: IdeaModule,
+                mainModuleNode: DataNode<ModuleData>,
+                projectDataNode: DataNode<ProjectData>,
+                resolverCtx: ProjectResolverContext
+            ) {
+                this@ComposableInitializeModuleDataAction.doInitialize(gradleModule, mainModuleNode, projectDataNode, resolverCtx)
+                lazyAfter().doInitialize(gradleModule, mainModuleNode, projectDataNode, resolverCtx)
+            }
+        }
+
+    operator fun plus(next: ComposableInitializeModuleDataAction): ComposableInitializeModuleDataAction = composeWith { next }
+}
+
+class InitializeModuleDataContext<TSourceSet>(
+    internal var jdkName: String? = null,
+    internal var moduleGroup: Array<String>? = null,
+) {
+    internal lateinit var mainModuleData: ModuleData
+    internal lateinit var mainModuleConfigPath: String
+    internal lateinit var mainModuleFileDirectoryPath: String
+    internal lateinit var sourceSetToRunTasks: Map<TSourceSet, Collection<ExternalSystemRunTask>>
+}
diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/utils/KotlinModuleUtils.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/utils/KotlinModuleUtils.kt
index a7028916d304..7e2580f6d6ee 100644
--- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/utils/KotlinModuleUtils.kt
+++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/configuration/utils/KotlinModuleUtils.kt
@@ -5,14 +5,14 @@ import org.gradle.tooling.model.idea.IdeaModule
 import org.jetbrains.kotlin.idea.gradleJava.configuration.KotlinMPPGradleProjectResolver
 import org.jetbrains.kotlin.idea.gradleTooling.compilationFullName
 import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
-import org.jetbrains.kotlin.idea.projectModel.KotlinModule
+import org.jetbrains.kotlin.idea.projectModel.KotlinComponent
 import org.jetbrains.plugins.gradle.service.project.ProjectResolverContext
 
-internal fun KotlinModule.fullName(simpleName: String = name) = when (this) {
+internal fun KotlinComponent.fullName(simpleName: String = name) = when (this) {
     is KotlinCompilation -> compilationFullName(simpleName, disambiguationClassifier)
     else -> simpleName
 }
 
 fun KotlinMPPGradleProjectResolver.Companion.getKotlinModuleId(
-    gradleModule: IdeaModule, kotlinModule: KotlinModule, resolverCtx: ProjectResolverContext
-) = getGradleModuleQualifiedName(resolverCtx, gradleModule, kotlinModule.fullName())
\ No newline at end of file
+    gradleModule: IdeaModule, kotlinComponent: KotlinComponent, resolverCtx: ProjectResolverContext
+) = getGradleModuleQualifiedName(resolverCtx, gradleModule, kotlinComponent.fullName())
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml b/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml
index bf8c28ff4db3..e629eda2cb05 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml
+++ b/plugins/kotlin/gradle/gradle-java/tests/kotlin.gradle.gradle-java.tests.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" name="JUnit4" level="project" />
     <orderEntry type="library" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.project-model" />
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/CompilerArgumentsCachingTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/CompilerArgumentsCachingTest.kt
index a604932f0486..1830e59ae499 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/CompilerArgumentsCachingTest.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/gradle/CompilerArgumentsCachingTest.kt
@@ -200,7 +200,7 @@ class CompilerArgumentsCachingTest {
         profilePhases = Random.nextBoolean()
         checkPhaseConditions = Random.nextBoolean()
         checkStickyPhaseConditions = Random.nextBoolean()
-        useFir = Random.nextBoolean()
+        useK2 = Random.nextBoolean()
         useFirExtendedCheckers = Random.nextBoolean()
         disableUltraLightClasses = Random.nextBoolean()
         useMixedNamedArguments = Random.nextBoolean()
@@ -223,7 +223,6 @@ class CompilerArgumentsCachingTest {
 
         pluginOptions = generateRandomStringArray(20)
         pluginClasspaths = generateRandomStringArray(20)
-        useExperimental = generateRandomStringArray(20)
         optIn = generateRandomStringArray(20)
         commonSources = generateRandomStringArray(20)
         disablePhases = generateRandomStringArray(20)
@@ -471,7 +470,7 @@ class CompilerArgumentsCachingTest {
             "profilePhases",
             "checkPhaseConditions",
             "checkStickyPhaseConditions",
-            "useFir",
+            "useK2",
             "useFirExtendedCheckers",
             "disableUltraLightClasses",
             "useMixedNamedArguments",
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt
index eabc69965b09..45d5456bd669 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/AbstractGradleMultiFileQuickFixTest.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.idea.codeInsight.gradle
 
 import com.intellij.codeInsight.daemon.quickFix.ActionHint
@@ -6,45 +6,21 @@ import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.PlatformTestUtil
-import com.intellij.testFramework.fixtures.CodeInsightTestFixture
-import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
 import com.intellij.testFramework.runInEdtAndWait
-import com.intellij.util.ThrowableRunnable
 import com.intellij.util.io.readText
 import org.jetbrains.kotlin.idea.core.util.toPsiFile
 import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils
-import org.jetbrains.kotlin.idea.test.runAll
 import org.jetbrains.kotlin.psi.KtFile
 import java.io.File
 import java.nio.file.Files
 import kotlin.io.path.isRegularFile
 import kotlin.io.path.pathString
-import kotlin.reflect.KMutableProperty0
 import kotlin.streams.asSequence
 
-abstract class AbstractGradleMultiFileQuickFixTest : MultiplePluginVersionGradleImportingTestCase() {
-    private lateinit var codeInsightTestFixture: CodeInsightTestFixture
-
+abstract class AbstractGradleMultiFileQuickFixTest : MultiplePluginVersionGradleImportingCodeInsightTestCase() {
     override fun testDataDirName() = "fixes"
     final override fun testDataDirectory(): File = super.testDataDirectory().resolve("before")
 
-    final override fun setUpFixtures() {
-        myTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()).fixture
-        codeInsightTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(myTestFixture)
-        codeInsightTestFixture.setUp()
-    }
-
-    final override fun tearDownFixtures() {
-        runAll(
-            ThrowableRunnable { codeInsightTestFixture.tearDown() },
-            ThrowableRunnable {
-                @Suppress("UNCHECKED_CAST")
-                (this::codeInsightTestFixture as KMutableProperty0<CodeInsightTestFixture?>).set(null)
-            },
-            ThrowableRunnable { myTestFixture = null }
-        )
-    }
-
     open val afterDirectory get() = testDataDirectory().parentFile.resolve("after")
 
     protected fun doMultiFileQuickFixTest(
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt
new file mode 100644
index 000000000000..f201335e12fa
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleCompletionTest.kt
@@ -0,0 +1,35 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.codeInsight.gradle
+
+import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.testFramework.runInEdtAndWait
+import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
+import org.junit.Test
+
+class GradleCompletionTest : MultiplePluginVersionGradleImportingCodeInsightTestCase() {
+    override fun testDataDirName() = "completion"
+
+    private fun doCompletionTest(expected: List<String>) {
+        val files = configureByFiles()
+        importProject()
+
+        val mainFile = files.find { it.nameWithoutExtension == "mainFile" } ?: error("mainFile is not found")
+        codeInsightTestFixture.configureFromExistingVirtualFile(mainFile)
+        runInEdtAndWait {
+            codeInsightTestFixture.performEditorAction(IdeActions.ACTION_CODE_COMPLETION)
+            val actual = codeInsightTestFixture.lookupElementStrings
+            assertEquals(
+                expected,
+                actual,
+            )
+        }
+    }
+
+    @Test
+    @PluginTargetVersions(pluginVersion = "1.5.31+")
+    fun testExpectAndActualDuplicationFunction() = doCompletionTest(listOf("myFunctionToCheck", "anotherMyFunctionToCheck"))
+
+    @Test
+    @PluginTargetVersions(pluginVersion = "1.5.31+")
+    fun testExpectAndActualDuplicationClass() = doCompletionTest(listOf("ClassToCheck", "AnotherClassToCheck"))
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt
index 4c440394d4c5..6e8631ad5899 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/ImportStatusCollector.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.kotlin.idea.codeInsight.gradle
 
 import com.intellij.build.events.BuildIssueEvent
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt
index 7b652cb6785d..c07ad76e4421 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinVersionUtils.kt
@@ -7,22 +7,22 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleKotlinTestUtils.Kotlin
 import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase.KotlinVersionRequirement
 
 val KotlinVersion.isSnapshot: Boolean
-    get() = this.classifier != null && this.classifier.lowercase() == "snapshot"
+    get() = this.classifier != null && this.classifier.toLowerCase() == "snapshot"
 
 val KotlinVersion.isDev: Boolean
-    get() = this.classifier != null && this.classifier.lowercase().contains("dev")
+    get() = this.classifier != null && this.classifier.toLowerCase().contains("dev")
 
 val KotlinVersion.isMilestone: Boolean
-    get() = this.classifier != null && this.classifier.lowercase().contains("m")
+    get() = this.classifier != null && this.classifier.toLowerCase().contains("m")
 
 val KotlinVersion.isAlpha: Boolean
-    get() = this.classifier != null && this.classifier.lowercase().contains("alpha")
+    get() = this.classifier != null && this.classifier.toLowerCase().contains("alpha")
 
 val KotlinVersion.isBeta: Boolean
-    get() = this.classifier != null && this.classifier.lowercase().contains("beta")
+    get() = this.classifier != null && this.classifier.toLowerCase().contains("beta")
 
 val KotlinVersion.isRC: Boolean
-    get() = this.classifier != null && this.classifier.lowercase().contains("rc")
+    get() = this.classifier != null && this.classifier.toLowerCase().contains("rc")
 
 val KotlinVersion.isWildcard: Boolean
     get() = this.classifier != null &&
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt
new file mode 100644
index 000000000000..58201d3cdf21
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingCodeInsightTestCase.kt
@@ -0,0 +1,24 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.codeInsight.gradle
+
+import com.intellij.testFramework.fixtures.CodeInsightTestFixture
+import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory
+import com.intellij.util.ThrowableRunnable
+import org.jetbrains.kotlin.idea.test.runAll
+
+abstract class MultiplePluginVersionGradleImportingCodeInsightTestCase : MultiplePluginVersionGradleImportingTestCase() {
+    protected val codeInsightTestFixture: CodeInsightTestFixture get() = _codeInsightTestFixture!!
+    private var _codeInsightTestFixture: CodeInsightTestFixture? = null
+
+    override fun setUpFixtures() {
+        myTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()).fixture
+        _codeInsightTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(myTestFixture)
+        codeInsightTestFixture.setUp()
+    }
+
+    override fun tearDownFixtures() = runAll(
+        ThrowableRunnable { codeInsightTestFixture.tearDown() },
+        ThrowableRunnable { _codeInsightTestFixture = null },
+        ThrowableRunnable { myTestFixture = null },
+    )
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/utils/KotlinSourceSetGraphUtilTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/utils/KotlinSourceSetGraphUtilTest.kt
index 918ac347396c..621edca69a12 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/utils/KotlinSourceSetGraphUtilTest.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/configuration/utils/KotlinSourceSetGraphUtilTest.kt
@@ -94,11 +94,11 @@ class KotlinSourceSetGraphUtilTest {
     fun `infer default test to production edges`() {
         val sourceSetsByName = mapOf(
             createKotlinSourceSetPair(COMMON_MAIN_SOURCE_SET_NAME),
-            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, isTestModule = true),
+            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, isTestComponent = true),
             createKotlinSourceSetPair("main"),
-            createKotlinSourceSetPair("test", isTestModule = true),
+            createKotlinSourceSetPair("test", isTestComponent = true),
             createKotlinSourceSetPair("abcMain"),
-            createKotlinSourceSetPair("abcTest", isTestModule = true)
+            createKotlinSourceSetPair("abcTest", isTestComponent = true)
         )
 
         val graph = GraphBuilder.directed().build<KotlinSourceSet>()
@@ -119,9 +119,9 @@ class KotlinSourceSetGraphUtilTest {
     fun `depends on graph will automatically infer missing dependsOn edges for Android source sets`() {
         val sourceSetsByName = mapOf(
             createKotlinSourceSetPair(COMMON_MAIN_SOURCE_SET_NAME),
-            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, isTestModule = true),
+            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, isTestComponent = true),
             createKotlinSourceSetPair("androidMain", platforms = setOf(KotlinPlatform.ANDROID)),
-            createKotlinSourceSetPair("androidTest", platforms = setOf(KotlinPlatform.ANDROID), isTestModule = true)
+            createKotlinSourceSetPair("androidTest", platforms = setOf(KotlinPlatform.ANDROID), isTestComponent = true)
         )
 
         assertEquals(
@@ -137,7 +137,7 @@ class KotlinSourceSetGraphUtilTest {
     fun `depends on graph when commonMain or commonTest are marked as KotlinPlatform ANDROID will still be empty`() {
         val sourceSetsByName = mapOf(
             createKotlinSourceSetPair(COMMON_MAIN_SOURCE_SET_NAME, platforms = setOf(KotlinPlatform.ANDROID)),
-            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, platforms = setOf(KotlinPlatform.ANDROID), isTestModule = true),
+            createKotlinSourceSetPair(COMMON_TEST_SOURCE_SET_NAME, platforms = setOf(KotlinPlatform.ANDROID), isTestComponent = true),
         )
 
         assertEquals(
@@ -170,7 +170,7 @@ private fun createKotlinSourceSetPair(
     declaredDependsOnSourceSets: Set<String> = emptySet(),
     allDependsOnSourceSets: Set<String> = declaredDependsOnSourceSets,
     platforms: Set<KotlinPlatform> = emptySet(),
-    isTestModule: Boolean = false,
+    isTestComponent: Boolean = false,
 ): Pair<String, KotlinSourceSet> = name to KotlinSourceSetImpl(
     name = name,
     languageSettings = KotlinLanguageSettingsImpl(
@@ -191,7 +191,7 @@ private fun createKotlinSourceSetPair(
     allDependsOnSourceSets = allDependsOnSourceSets,
     additionalVisibleSourceSets = emptySet(),
     actualPlatforms = KotlinPlatformContainerImpl().apply { pushPlatforms(platforms) },
-    isTestModule = isTestModule
+    isTestComponent = isTestComponent
 )
 
 private fun Graph<KotlinSourceSet>.nameEdges() = edges()
diff --git a/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml b/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
index 83d2f3bd3976..ed3f759d6f61 100644
--- a/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
+++ b/plugins/kotlin/gradle/gradle-native/kotlin.gradle.gradle-native.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.native" />
     <orderEntry type="module" module-name="kotlin.idea" />
diff --git a/plugins/kotlin/gradle/gradle-native/tests/kotlin.gradle.gradle-native.tests.iml b/plugins/kotlin/gradle/gradle-native/tests/kotlin.gradle.gradle-native.tests.iml
index 4aabe1b80c15..db14caad7e4c 100644
--- a/plugins/kotlin/gradle/gradle-native/tests/kotlin.gradle.gradle-native.tests.iml
+++ b/plugins/kotlin/gradle/gradle-native/tests/kotlin.gradle.gradle-native.tests.iml
@@ -15,7 +15,7 @@
     <orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.native" />
     <orderEntry type="module" module-name="kotlin.idea" />
diff --git a/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml b/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
index 5507bdd3aa19..dd96695e9675 100644
--- a/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
+++ b/plugins/kotlin/gradle/gradle-tooling/kotlin.gradle.gradle-tooling.iml
@@ -18,6 +18,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -26,5 +27,9 @@
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension" />
     <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test-junit" level="project" />
+    <orderEntry type="library" scope="TEST" name="Log4J" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService b/plugins/kotlin/gradle/gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
index 6f32f62d624b..3a29cbf9037e 100644
--- a/plugins/kotlin/gradle/gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+++ b/plugins/kotlin/gradle/gradle-tooling/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService
@@ -2,6 +2,7 @@
 org.jetbrains.kotlin.idea.gradleTooling.KotlinDslScriptTaskModelBuilder
 org.jetbrains.kotlin.idea.gradleTooling.KotlinGradleModelBuilder
 org.jetbrains.kotlin.idea.gradleTooling.KotlinMPPGradleModelBuilder
+org.jetbrains.kotlin.idea.gradleTooling.KotlinKPMGradleModelBuilder
 org.jetbrains.kotlin.idea.gradleTooling.KotlinCocoaPodsModelBuilder
 org.jetbrains.kotlin.idea.gradleTooling.KotlinCommonizerModelBuilder
 org.jetbrains.kotlin.idea.gradleTooling.model.allopen.AllOpenModelBuilderService
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinFragmentCache.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinFragmentCache.kt
new file mode 100644
index 000000000000..a84533e74ed8
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinFragmentCache.kt
@@ -0,0 +1,31 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragment
+import org.jetbrains.kotlin.idea.projectModel.KotlinModuleIdentifier
+
+interface KotlinFragmentCache {
+    fun withCache(
+        kotlinModuleIdentifier: KotlinModuleIdentifier, fragmentName: String, createFragment: () -> KotlinFragment
+    ): KotlinFragment
+
+    object None : KotlinFragmentCache {
+        override fun withCache(
+            kotlinModuleIdentifier: KotlinModuleIdentifier,
+            fragmentName: String,
+            createFragment: () -> KotlinFragment
+        ): KotlinFragment = createFragment()
+    }
+}
+
+internal class DefaultKotlinFragmentCache : KotlinFragmentCache {
+    private data class Key(val moduleIdentifier: KotlinModuleIdentifier, val fragmentName: String)
+
+    private val fragments = mutableMapOf<Key, KotlinFragment>()
+
+    override fun withCache(
+        kotlinModuleIdentifier: KotlinModuleIdentifier,
+        fragmentName: String,
+        createFragment: () -> KotlinFragment
+    ) = fragments.getOrPut(Key(kotlinModuleIdentifier, fragmentName), createFragment)
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinGradleModelBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinGradleModelBuilder.kt
index 97b53c3dcbf9..f5cdde689282 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinGradleModelBuilder.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinGradleModelBuilder.kt
@@ -12,8 +12,8 @@ import org.gradle.tooling.model.Model
 import org.gradle.tooling.model.build.BuildEnvironment
 import org.gradle.tooling.model.gradle.GradleBuild
 import org.gradle.util.GradleVersion
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.CACHE_MAPPER_BRANCHING
 import org.jetbrains.kotlin.idea.gradleTooling.arguments.CachedExtractedArgsInfo
+import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheMapperImpl
 import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCachingChain
 import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCachingManager.cacheCompilerArgument
 import org.jetbrains.kotlin.idea.projectModel.CompilerArgumentsCacheAware
@@ -59,6 +59,9 @@ interface KotlinGradleModel : Serializable {
     val kotlinTarget: String?
     val kotlinTaskProperties: KotlinTaskPropertiesBySourceSet
     val gradleUserHome: String
+    val cacheAware: CompilerArgumentsCacheAware
+
+    @Deprecated(level = DeprecationLevel.WARNING, message = "Use KotlinGradleModel#cacheAware instead")
     val partialCacheAware: CompilerArgumentsCacheAware
 }
 
@@ -74,8 +77,17 @@ data class KotlinGradleModelImpl(
     override val kotlinTarget: String? = null,
     override val kotlinTaskProperties: KotlinTaskPropertiesBySourceSet,
     override val gradleUserHome: String,
+    override val cacheAware: CompilerArgumentsCacheAware
+) : KotlinGradleModel {
+
+    @Deprecated(
+        "Use KotlinGradleModel#cacheAware instead", level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("KotlinGradleModel#cacheAware")
+    )
+    @Suppress("OverridingDeprecatedMember")
     override val partialCacheAware: CompilerArgumentsCacheAware
-) : KotlinGradleModel
+        get() = cacheAware
+}
 
 abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService {
     companion object {
@@ -96,12 +108,12 @@ abstract class AbstractKotlinGradleModelBuilder : ModelBuilderService {
             "kotlin2js" to "kotlin-platform-js"
         )
         val kotlinPluginIds = listOf("kotlin", "kotlin2js", "kotlin-android")
-        val ABSTRACT_KOTLIN_COMPILE_CLASS = "org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile"
+        const val ABSTRACT_KOTLIN_COMPILE_CLASS = "org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile"
 
-        val kotlinProjectExtensionClass = "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension"
-        val kotlinSourceSetClass = "org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet"
+        const val kotlinProjectExtensionClass = "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension"
+        const val kotlinSourceSetClass = "org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet"
 
-        val kotlinPluginWrapper = "org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapperKt"
+        const val kotlinPluginWrapper = "org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapperKt"
 
         private val propertyClassPresent = GradleVersion.current() >= GradleVersion.version("4.3")
 
@@ -249,22 +261,21 @@ class KotlinGradleModelBuilder : AbstractKotlinGradleModelBuilder(), ModelBuilde
         val cachedCompilerArgumentsBySourceSet = LinkedHashMap<String, CachedExtractedArgsInfo>()
         val additionalVisibleSourceSets = LinkedHashMap<String, Set<String>>()
         val extraProperties = HashMap<String, KotlinTaskProperties>()
-        val masterMapper = builderContext?.getData(CACHE_MAPPER_BRANCHING) ?: return null
-        val detachableMapper = masterMapper.branchOffDetachable(project.name == "buildSrc")
+        val argsMapper = CompilerArgumentsCacheMapperImpl()
 
         val kotlinCompileTasks = target?.let { it.compilations ?: emptyList() }
-                ?.mapNotNull { compilation -> compilation.getCompileKotlinTaskName(project) }
-                ?: (project.getAllTasks(false)[project]?.filter { it.javaClass.name in kotlinCompileTaskClasses } ?: emptyList())
+            ?.mapNotNull { compilation -> compilation.getCompileKotlinTaskName(project) }
+            ?: (project.getAllTasks(false)[project]?.filter { it.javaClass.name in kotlinCompileTaskClasses } ?: emptyList())
 
         kotlinCompileTasks.forEach { compileTask ->
             if (compileTask.javaClass.name !in kotlinCompileTaskClasses) return@forEach
             val sourceSetName = compileTask.getSourceSetName()
             if (androidVariantRequest.shouldSkipSourceSet(sourceSetName)) return@forEach
-            val currentArguments = CompilerArgumentsCachingChain.extractAndCacheTask(compileTask, detachableMapper, defaultsOnly = false)
-            val defaultArguments = CompilerArgumentsCachingChain.extractAndCacheTask(compileTask, detachableMapper, defaultsOnly = true)
-            val dependencyClasspath = compileTask.getDependencyClasspath().map { cacheCompilerArgument(it, detachableMapper) }
+            val currentArguments = CompilerArgumentsCachingChain.extractAndCacheTask(compileTask, argsMapper, defaultsOnly = false)
+            val defaultArguments = CompilerArgumentsCachingChain.extractAndCacheTask(compileTask, argsMapper, defaultsOnly = true)
+            val dependencyClasspath = compileTask.getDependencyClasspath().map { cacheCompilerArgument(it, argsMapper) }
             cachedCompilerArgumentsBySourceSet[sourceSetName] =
-                CachedExtractedArgsInfo(detachableMapper.cacheOriginIdentifier, currentArguments, defaultArguments, dependencyClasspath)
+                CachedExtractedArgsInfo(argsMapper.cacheOriginIdentifier, currentArguments, defaultArguments, dependencyClasspath)
 
             additionalVisibleSourceSets[sourceSetName] = getAdditionalVisibleSourceSets(project, sourceSetName)
             extraProperties.acknowledgeTask(compileTask, null)
@@ -284,7 +295,7 @@ class KotlinGradleModelBuilder : AbstractKotlinGradleModelBuilder(), ModelBuilde
             kotlinTarget = platform ?: kotlinPluginId,
             kotlinTaskProperties = extraProperties,
             gradleUserHome = project.gradle.gradleUserHomeDir.absolutePath,
-            partialCacheAware = detachableMapper.detachCacheAware()
+            cacheAware = argsMapper
         )
     }
 }
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModel.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModel.kt
new file mode 100644
index 000000000000..2e5f409c4033
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModel.kt
@@ -0,0 +1,16 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.jetbrains.kotlin.idea.projectModel.KotlinKPMModule
+import java.io.Serializable
+
+interface KotlinProjectModelSettings : Serializable {
+    val coreLibrariesVersion: String
+    val explicitApiModeCliOption: String?
+}
+
+interface KotlinKPMGradleModel : Serializable {
+    val kpmModules: Collection<KotlinKPMModule>
+    val kotlinNativeHome: String
+    val settings: KotlinProjectModelSettings
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelBuilder.kt
new file mode 100644
index 000000000000..54ceecba1b09
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelBuilder.kt
@@ -0,0 +1,47 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.idea.gradleTooling.builders.KotlinModuleBuilder
+import org.jetbrains.kotlin.idea.gradleTooling.builders.KotlinProjectModelSettingsBuilder
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinKpmExtensionReflection
+import org.jetbrains.plugins.gradle.tooling.AbstractModelBuilderService
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
+
+class KotlinKPMGradleModelBuilder : AbstractModelBuilderService() {
+    override fun canBuild(modelName: String?): Boolean = modelName == KotlinKPMGradleModel::class.java.name
+
+    override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder = ErrorMessageBuilder
+        .create(project, e, "Gradle import errors")
+        .withDescription("Unable to build Kotlin PM20 project configuration")
+
+    override fun buildAll(modelName: String, project: Project, context: ModelBuilderContext): KotlinKPMGradleModel? {
+        try {
+            val kpmExtension = project.kpmExtension ?: return null
+            val kpmExtensionReflection = KotlinKpmExtensionReflection(kpmExtension)
+            val kpmProjectSettings = KotlinProjectModelSettingsBuilder.buildComponent(kpmExtensionReflection) ?: return null
+            val kotlinNativeHome = KotlinNativeHomeEvaluator.getKotlinNativeHome(project) ?: KotlinMPPGradleModel.NO_KOTLIN_NATIVE_HOME
+            val importingContext = KotlinProjectModelImportingContext(project, kpmExtension.javaClass.classLoader)
+            val kpmModules = kpmExtensionReflection.modules.orEmpty().mapNotNull { originModule ->
+                KotlinModuleBuilder.buildComponent(originModule, importingContext.withFragmentCache())
+            }
+
+            return KotlinKPMGradleModelImpl(kpmModules, kpmProjectSettings, kotlinNativeHome)
+        } catch (throwable: Throwable) {
+            project.logger.error("Failed building KotlinKPMGradleModel", throwable)
+            throw throwable
+        }
+    }
+
+    companion object {
+        private const val KPM_GRADLE_PLUGIN_ID = "org.jetbrains.kotlin.multiplatform.pm20"
+        private const val KPM_EXTENSION_CLASS_NAME = "org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension"
+
+        private val Project.kpmPlugin
+            get() = project.plugins.findPlugin(KPM_GRADLE_PLUGIN_ID)
+
+        private val Project.kpmExtension
+            get() = kpmPlugin?.javaClass?.classLoader?.loadClassOrNull(KPM_EXTENSION_CLASS_NAME)?.let { project.extensions.findByType(it) }
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelImpl.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelImpl.kt
new file mode 100644
index 000000000000..96adaf6c5aa2
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinKPMGradleModelImpl.kt
@@ -0,0 +1,55 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.jetbrains.kotlin.idea.projectModel.*
+import java.io.File
+
+class KotlinProjectModelSettingsImpl(
+    override val coreLibrariesVersion: String,
+    override val explicitApiModeCliOption: String?,
+) : KotlinProjectModelSettings
+
+data class KotlinLocalModuleIdentifierImpl(
+    override val moduleClassifier: String?,
+    override val buildId: String,
+    override val projectId: String
+) : KotlinLocalModuleIdentifier
+
+data class KotlinMavenModuleIdentifierImpl(
+    override val moduleClassifier: String?,
+    override val group: String,
+    override val name: String
+) : KotlinMavenModuleIdentifier
+
+class KotlinFragmentResolvedSourceDependency(override val dependencyIdentifier: String) : KotlinFragmentResolvedDependency
+
+class KotlinFragmentResolvedBinaryDependency(override val dependencyIdentifier: String, val dependencyContent: Set<File>? = null) :
+    KotlinFragmentResolvedDependency
+
+internal class KotlinFragmentImpl(
+    override val fragmentName: String,
+    override val isTestFragment: Boolean,
+    override val moduleIdentifier: KotlinModuleIdentifier,
+    override val languageSettings: KotlinLanguageSettings?,
+    override val directRefinesFragments: Collection<KotlinFragment>,
+    override val resolvedDependencies: Collection<KotlinFragmentResolvedDependency>,
+    override val sourceDirs: Set<File>,
+    override val resourceDirs: Set<File>
+) : KotlinFragment
+
+internal class KotlinVariantImpl(
+    private val fragment: KotlinFragment,
+    override val variantAttributes: KotlinKPMVariantAttributesMap,
+    override val compilationOutputs: KotlinCompilationOutput?
+) : KotlinVariant, KotlinFragment by fragment
+
+class KotlinKPMModuleImpl(
+    override val moduleIdentifier: KotlinModuleIdentifier,
+    override val fragments: Collection<KotlinFragment>,
+) : KotlinKPMModule
+
+class KotlinKPMGradleModelImpl(
+    override val kpmModules: Collection<KotlinKPMModule>,
+    override val settings: KotlinProjectModelSettings,
+    override val kotlinNativeHome: String,
+) : KotlinKPMGradleModel
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModel.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModel.kt
index aba40b8936e3..51bb6865b3e0 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModel.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModel.kt
@@ -47,6 +47,9 @@ interface KotlinMPPGradleModel : KotlinSourceSetContainer, Serializable {
     val targets: Collection<KotlinTarget>
     val extraFeatures: ExtraFeatures
     val kotlinNativeHome: String
+    val cacheAware: CompilerArgumentsCacheAware
+
+    @Deprecated(level = DeprecationLevel.WARNING, message = "Use KotlinMPPGradleModel#cacheAware instead")
     val partialCacheAware: CompilerArgumentsCacheAware
     val kotlinImportingDiagnostics: KotlinImportingDiagnosticsContainer
 
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelBuilder.kt
index 6e90878e57ed..0d6eab73aa6c 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelBuilder.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelBuilder.kt
@@ -5,40 +5,25 @@ package org.jetbrains.kotlin.idea.gradleTooling
 import org.gradle.api.Named
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
-import org.gradle.api.Task
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.component.ProjectComponentIdentifier
-import org.gradle.api.file.FileCollection
-import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.logging.Logging
-import org.gradle.api.provider.Property
-import org.gradle.api.provider.Provider
-import org.gradle.api.tasks.Exec
-import org.gradle.api.tasks.TaskProvider
 import org.jetbrains.kotlin.idea.gradleTooling.GradleImportProperties.*
 import org.jetbrains.kotlin.idea.gradleTooling.KotlinMPPGradleModel.Companion.NO_KOTLIN_NATIVE_HOME
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.CACHE_MAPPER_BRANCHING
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.buildCachedArgsInfo
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.buildSerializedArgsInfo
-import org.jetbrains.kotlin.idea.projectModel.*
+import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheMapperImpl
+import org.jetbrains.kotlin.idea.gradleTooling.builders.KotlinSourceSetProtoBuilder
+import org.jetbrains.kotlin.idea.gradleTooling.builders.KotlinTargetBuilder
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinTargetReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
 import org.jetbrains.kotlin.idea.projectModel.KotlinSourceSet.Companion.COMMON_MAIN_SOURCE_SET_NAME
 import org.jetbrains.kotlin.idea.projectModel.KotlinSourceSet.Companion.COMMON_TEST_SOURCE_SET_NAME
-import org.jetbrains.plugins.gradle.DefaultExternalDependencyId
-import org.jetbrains.plugins.gradle.model.*
+import org.jetbrains.kotlin.idea.projectModel.KotlinTarget
+import org.jetbrains.plugins.gradle.tooling.AbstractModelBuilderService
 import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
-import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
-import org.jetbrains.plugins.gradle.tooling.util.DependencyResolver
-import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder
-import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl
-import java.io.File
-import java.lang.reflect.Method
-import kotlin.collections.ArrayList
-import kotlin.collections.HashMap
-import kotlin.collections.LinkedHashSet
-
-class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
+
+private val MPP_BUILDER_LOGGER = Logging.getLogger(KotlinMPPGradleModelBuilder::class.java)
+
+class KotlinMPPGradleModelBuilder : AbstractModelBuilderService() {
+
     override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder {
         return ErrorMessageBuilder
             .create(project, e, "Gradle import errors")
@@ -49,10 +34,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
         return modelName == KotlinMPPGradleModel::class.java.name
     }
 
-    override fun buildAll(modelName: String, project: Project): KotlinMPPGradleModel? {
-        return buildAll(project, null)
-    }
-
     override fun buildAll(modelName: String, project: Project, builderContext: ModelBuilderContext): KotlinMPPGradleModel? {
         return buildAll(project, builderContext)
     }
@@ -60,17 +41,15 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
     private fun buildAll(project: Project, builderContext: ModelBuilderContext?): KotlinMPPGradleModel? {
         try {
             val projectTargets = project.getTargets() ?: return null
-            val masterCompilerArgumentsCacheMapper = builderContext?.getData(CACHE_MAPPER_BRANCHING) ?: return null
-            val detachableCompilerArgumentsCacheMapper = masterCompilerArgumentsCacheMapper.branchOffDetachable()
+            val modelBuilderContext = builderContext ?: return null
+            val argsMapper = CompilerArgumentsCacheMapperImpl()
 
-            val dependencyResolver = DependencyResolverImpl(project, false, true, SourceSetCachedFinder(project))
-            val dependencyMapper = KotlinDependencyMapper()
-            val importingContext = MultiplatformModelImportingContextImpl(project, detachableCompilerArgumentsCacheMapper)
+            val importingContext = MultiplatformModelImportingContextImpl(project, argsMapper, modelBuilderContext)
 
-            val sourceSets = buildSourceSets(importingContext, dependencyResolver, dependencyMapper) ?: return null
+            val sourceSets = buildSourceSets(importingContext) ?: return null
             importingContext.initializeSourceSets(sourceSets)
 
-            val targets = buildTargets(importingContext, projectTargets, dependencyResolver, dependencyMapper)
+            val targets = buildTargets(importingContext, projectTargets)
             importingContext.initializeTargets(targets)
             importingContext.initializeCompilations(targets.flatMap { it.compilations })
 
@@ -87,8 +66,8 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
                     isNativeDependencyPropagationEnabled = importingContext.getProperty(ENABLE_NATIVE_DEPENDENCY_PROPAGATION)
                 ),
                 kotlinNativeHome = kotlinNativeHome,
-                dependencyMap = dependencyMapper.toDependencyMap(),
-                partialCacheAware = detachableCompilerArgumentsCacheMapper.detachCacheAware()
+                dependencyMap = importingContext.dependencyMapper.toDependencyMap(),
+                cacheAware = argsMapper
             ).apply {
                 kotlinImportingDiagnostics += collectDiagnostics(importingContext)
             }
@@ -107,24 +86,18 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
         val (orphanSourceSets, nonOrphanSourceSets) = importingContext.sourceSets.partition { importingContext.isOrphanSourceSet(it) }
 
         orphanSourceSets.forEach {
-            logger.warn("[sync warning] Source set \"${it.name}\" is not compiled with any compilation. This source set is not imported in the IDE.")
+            MPP_BUILDER_LOGGER.warn("[sync warning] Source set \"${it.name}\" is not compiled with any compilation. This source set is not imported in the IDE.")
         }
         return nonOrphanSourceSets.associateBy { it.name }
     }
 
     private fun getCoroutinesState(project: Project): String? {
         val kotlinExt = project.extensions.findByName("kotlin") ?: return null
-        val getExperimental = kotlinExt.javaClass.getMethodOrNull("getExperimental") ?: return null
-        val experimentalExt = getExperimental(kotlinExt) ?: return null
-        val getCoroutines = experimentalExt.javaClass.getMethodOrNull("getCoroutines") ?: return null
-        return getCoroutines(experimentalExt) as? String
+        val experimentalExt = kotlinExt["getExperimental"] ?: return null
+        return experimentalExt["getCoroutines"] as? String
     }
 
-    private fun buildSourceSets(
-        importingContext: MultiplatformModelImportingContext,
-        dependencyResolver: DependencyResolver,
-        dependencyMapper: KotlinDependencyMapper
-    ): Map<String, KotlinSourceSetImpl>? {
+    private fun buildSourceSets(importingContext: MultiplatformModelImportingContext): Map<String, KotlinSourceSetImpl>? {
         val kotlinExt = importingContext.project.extensions.findByName("kotlin") ?: return null
         val getSourceSets = kotlinExt.javaClass.getMethodOrNull("getSourceSets") ?: return null
 
@@ -132,9 +105,10 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
         val sourceSets =
             (getSourceSets(kotlinExt) as? NamedDomainObjectContainer<Named>)?.asMap?.values ?: emptyList<Named>()
         val androidDeps = buildAndroidDeps(importingContext, kotlinExt.javaClass.classLoader)
+        val sourceSetProtoBuilder = KotlinSourceSetProtoBuilder(androidDeps, importingContext.project)
 
         val allSourceSetsProtosByNames = sourceSets.mapNotNull {
-            buildSourceSet(it, dependencyResolver, importingContext.project, dependencyMapper, androidDeps)
+            sourceSetProtoBuilder.buildComponent(it, importingContext)
         }.associateBy { it.name }
 
         // Some performance optimisation: do not build metadata dependencies if source set is not common
@@ -159,635 +133,19 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
                 @Suppress("UNCHECKED_CAST")
                 return getAndroidSourceSetDependencies?.let { it(resolver, importingContext.project) } as Map<String, List<Any>>?
             } catch (e: Exception) {
-                logger.info("Unexpected exception", e)
+                MPP_BUILDER_LOGGER.info("Unexpected exception", e)
             }
         }
         return null
     }
 
-    private fun buildSourceSet(
-        gradleSourceSet: Named,
-        dependencyResolver: DependencyResolver,
-        project: Project,
-        dependencyMapper: KotlinDependencyMapper,
-        androidDeps: Map<String, List<Any>>?
-    ): KotlinSourceSetProto? {
-        val sourceSetClass = gradleSourceSet.javaClass
-        val getLanguageSettings = sourceSetClass.getMethodOrNull("getLanguageSettings") ?: return null
-        val getSourceDirSet = sourceSetClass.getMethodOrNull("getKotlin") ?: return null
-        val getResourceDirSet = sourceSetClass.getMethodOrNull("getResources") ?: return null
-        val getDependsOn = sourceSetClass.getMethodOrNull("getDependsOn") ?: return null
-        val languageSettings = getLanguageSettings(gradleSourceSet)?.let { buildLanguageSettings(it) } ?: return null
-        val sourceDirs = (getSourceDirSet(gradleSourceSet) as? SourceDirectorySet)?.srcDirs ?: emptySet()
-        val resourceDirs = (getResourceDirSet(gradleSourceSet) as? SourceDirectorySet)?.srcDirs ?: emptySet()
-
-        @Suppress("UNCHECKED_CAST")
-        val dependsOnSourceSets = (getDependsOn(gradleSourceSet) as? Set<Named>)?.mapTo(LinkedHashSet()) { it.name } ?: emptySet<String>()
-
-
-        val sourceSetDependenciesBuilder: () -> Array<KotlinDependencyId> = {
-            buildSourceSetDependencies(gradleSourceSet, dependencyResolver, project, androidDeps)
-                .map { dependencyMapper.getId(it) }
-                .distinct()
-                .toTypedArray()
-        }
-
-        val intransitiveSourceSetDependenciesBuilder: () -> Array<KotlinDependencyId> = {
-            buildIntransitiveSourceSetDependencies(gradleSourceSet, dependencyResolver, project)
-                .map { dependencyMapper.getId(it) }
-                .distinct()
-                .toTypedArray()
-        }
-
-        return KotlinSourceSetProto(
-            name = gradleSourceSet.name,
-            languageSettings = languageSettings,
-            sourceDirs = sourceDirs,
-            resourceDirs = resourceDirs,
-            regularDependencies = sourceSetDependenciesBuilder,
-            intransitiveDependencies = intransitiveSourceSetDependenciesBuilder,
-            dependsOnSourceSets = dependsOnSourceSets,
-            additionalVisibleSourceSets = getAdditionalVisibleSourceSets(project, gradleSourceSet)
-        )
-    }
-
-    private fun buildLanguageSettings(gradleLanguageSettings: Any): KotlinLanguageSettings? {
-        val languageSettingsClass = gradleLanguageSettings.javaClass
-        val getLanguageVersion = languageSettingsClass.getMethodOrNull("getLanguageVersion") ?: return null
-        val getApiVersion = languageSettingsClass.getMethodOrNull("getApiVersion") ?: return null
-        val getProgressiveMode = languageSettingsClass.getMethodOrNull("getProgressiveMode") ?: return null
-        val getEnabledLanguageFeatures = languageSettingsClass.getMethodOrNull("getEnabledLanguageFeatures") ?: return null
-        val getOptInAnnotationsInUse = languageSettingsClass.getMethodOrNull("getOptInAnnotationsInUse")
-        val getCompilerPluginArguments = languageSettingsClass.getMethodOrNull("getCompilerPluginArguments")
-        val getCompilerPluginClasspath = languageSettingsClass.getMethodOrNull("getCompilerPluginClasspath")
-        val getFreeCompilerArgs = languageSettingsClass.getMethodOrNull("getFreeCompilerArgs")
-        @Suppress("UNCHECKED_CAST")
-        return KotlinLanguageSettingsImpl(
-            getLanguageVersion(gradleLanguageSettings) as? String,
-            getApiVersion(gradleLanguageSettings) as? String,
-            getProgressiveMode(gradleLanguageSettings) as? Boolean ?: false,
-            getEnabledLanguageFeatures(gradleLanguageSettings) as? Set<String> ?: emptySet(),
-            getOptInAnnotationsInUse?.invoke(gradleLanguageSettings) as? Set<String> ?: emptySet(),
-            (getCompilerPluginArguments?.invoke(gradleLanguageSettings) as? List<String> ?: emptyList()).toTypedArray(),
-            (getCompilerPluginClasspath?.invoke(gradleLanguageSettings) as? FileCollection)?.files ?: emptySet(),
-            (getFreeCompilerArgs?.invoke(gradleLanguageSettings) as? List<String>).orEmpty().toTypedArray()
-        )
-    }
-
-    private fun buildDependencies(
-        dependencyHolder: Any,
-        dependencyResolver: DependencyResolver,
-        configurationNameAccessor: String,
-        scope: String,
-        project: Project,
-        metadataDependencyTransformationBuilder: MetadataDependencyTransformationBuilder
-    ): Collection<KotlinDependency> {
-        val dependencyHolderClass = dependencyHolder.javaClass
-        val getConfigurationName = dependencyHolderClass.getMethodOrNull(configurationNameAccessor) ?: return emptyList()
-        val configurationName = getConfigurationName(dependencyHolder) as? String ?: return emptyList()
-        val configuration = project.configurations.findByName(configurationName) ?: return emptyList()
-        if (!configuration.isCanBeResolved) return emptyList()
-
-        val dependencyAdjuster =
-            DependencyAdjuster(configuration, scope, project, metadataDependencyTransformationBuilder.getTransformations(configurationName))
-
-        val resolvedDependencies = dependencyResolver
-            .resolveDependencies(configuration)
-            .apply {
-                forEach<ExternalDependency?> { (it as? AbstractExternalDependency)?.scope = scope }
-                forEach<ExternalDependency?> {
-                    if (it is DefaultExternalProjectDependency && it.projectDependencyArtifacts !is ArrayList) {
-                        it.projectDependencyArtifacts = ArrayList(it.projectDependencyArtifacts)
-                    }
-                }
-            }
-            .flatMap { dependencyAdjuster.adjustDependency(it) }
-        val singleDependencyFiles = resolvedDependencies.mapNotNullTo(LinkedHashSet()) {
-            (it as? FileCollectionDependency)?.files?.singleOrNull()
-        }
-        // Workaround for duplicated dependencies specified as a file collection (KT-26675)
-        // Drop this code when the issue is fixed in the platform
-        return resolvedDependencies.filter { dependency ->
-            if (dependency !is FileCollectionDependency) return@filter true
-            val files = dependency.files
-            if (files.size <= 1) return@filter true
-            (files.any { it !in singleDependencyFiles })
-        }
-    }
-
     private fun buildTargets(
         importingContext: MultiplatformModelImportingContext,
-        projectTargets: Collection<Named>,
-        dependencyResolver: DependencyResolver,
-        dependencyMapper: KotlinDependencyMapper
+        projectTargets: Collection<Named>
     ): Collection<KotlinTarget> {
-        return projectTargets.mapNotNull { buildTarget(importingContext, it, dependencyResolver, dependencyMapper) }
-    }
-
-    private fun buildArtifact(
-        executableName: String,
-        linkTask: Task,
-        runConfiguration: KonanRunConfigurationModel,
-        exportDependencies: Array<KotlinDependencyId>
-    ): KonanArtifactModel? {
-        val outputKind = linkTask["getOutputKind"]["name"] as? String ?: return null
-        val konanTargetName = linkTask["getTarget"] as? String ?: error("No arch target found")
-        val outputFile = (linkTask["getOutputFile"] as? Provider<*>)?.orNull as? File ?: return null
-        val compilation = if (linkTask["getCompilation"] is Provider<*>)
-            (linkTask["getCompilation"] as Provider<*>).get()
-        else
-            linkTask["getCompilation"]
-        val compilationTarget = compilation["getTarget"]
-        val compilationTargetName = compilationTarget["getName"] as? String ?: return null
-        val isTests = linkTask["getProcessTests"] as? Boolean ?: return null
-
-        @Suppress("UNCHECKED_CAST")
-        val freeCompilerArgs = (linkTask["getKotlinOptions"]["getFreeCompilerArgs"] as? List<String>).orEmpty().toTypedArray()
-
-        return KonanArtifactModelImpl(
-            compilationTargetName,
-            executableName,
-            outputKind,
-            konanTargetName,
-            outputFile,
-            linkTask.path,
-            runConfiguration,
-            isTests,
-            freeCompilerArgs,
-            exportDependencies
-        )
-    }
-
-    private fun konanArtifacts(
-        target: Named, dependencyResolver: DependencyResolver, project: Project, dependencyMapper: KotlinDependencyMapper
-    ): List<KonanArtifactModel> {
-        val result = ArrayList<KonanArtifactModel>()
-
-        val binaries = target["getBinaries"] as? Collection<*> ?: return result
-        binaries.forEach { binary ->
-            val executableName = binary["getBaseName"] as? String ?: ""
-            val linkTask = binary["getLinkTask"] as? Task ?: return@forEach
-            val runConfiguration = KonanRunConfigurationModelImpl(binary["getRunTask"] as? Exec)
-            val exportDependencies = binary?.let {
-                val transformationBuilder = MetadataDependencyTransformationBuilder(it)
-                buildDependencies(it, dependencyResolver, "getExportConfigurationName", "COMPILE", project, transformationBuilder)
-            }
-
-            buildArtifact(
-                executableName,
-                linkTask,
-                runConfiguration,
-                exportDependencies?.map { dependencyMapper.getId(it) }?.distinct()?.toTypedArray() ?: emptyArray()
-            )?.let { result.add(it) }
-        }
-
-        return result
-    }
-
-    private fun buildTarget(
-        importingContext: MultiplatformModelImportingContext,
-        gradleTarget: Named,
-        dependencyResolver: DependencyResolver,
-        dependencyMapper: KotlinDependencyMapper
-    ): KotlinTarget? {
-        val targetClass = gradleTarget.javaClass
-
-        /* Loading class safely to still support Kotlin Gradle Plugin 1.3.30 */
-        val metadataTargetClass = targetClass.classLoader.loadClassOrNull("org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget")
-        if (metadataTargetClass?.isInstance(gradleTarget) == true) return null
-
-        val getPlatformType = targetClass.getMethodOrNull("getPlatformType") ?: return null
-        val getDisambiguationClassifier = targetClass.getMethodOrNull("getDisambiguationClassifier") ?: return null
-        val platformId = (getPlatformType.invoke(gradleTarget) as? Named)?.name ?: return null
-        val platform = KotlinPlatform.byId(platformId) ?: return null
-        val useDisambiguationClassifier =
-            targetClass.getMethodOrNull("getUseDisambiguationClassifierAsSourceSetNamePrefix")?.invoke(gradleTarget) as? Boolean ?: true
-        val disambiguationClassifier = if (useDisambiguationClassifier)
-            getDisambiguationClassifier(gradleTarget) as? String
-        else {
-            targetClass.getMethodOrNull("getOverrideDisambiguationClassifierOnIdeImport")?.invoke(gradleTarget) as? String
-        }
-        val getPreset = targetClass.getMethodOrNull("getPreset")
-        val targetPresetName: String? = try {
-            val targetPreset = getPreset?.invoke(gradleTarget)
-            val getPresetName = targetPreset?.javaClass?.getMethodOrNull("getName")
-            getPresetName?.invoke(targetPreset) as? String
-        } catch (e: Throwable) {
-            "${e::class.java.name}:${e.message}"
-        }
-
-        val gradleCompilations = gradleTarget.compilations ?: return null
-        val compilations = gradleCompilations.mapNotNull {
-            buildCompilation(importingContext, it, platform, disambiguationClassifier, dependencyResolver, dependencyMapper)
-        }
-        val jar = buildTargetJar(gradleTarget, importingContext.project)
-        val testRunTasks = buildTestRunTasks(importingContext.project, gradleTarget)
-        val nativeMainRunTasks =
-            if (platform == KotlinPlatform.NATIVE) buildNativeMainRunTasks(gradleTarget)
-            else emptyList()
-        val artifacts = konanArtifacts(gradleTarget, dependencyResolver, importingContext.project, dependencyMapper)
-        val target = KotlinTargetImpl(
-            gradleTarget.name,
-            targetPresetName,
-            disambiguationClassifier,
-            platform,
-            compilations,
-            testRunTasks,
-            nativeMainRunTasks,
-            jar,
-            artifacts
-        )
-        compilations.forEach {
-            it.disambiguationClassifier = target.disambiguationClassifier
-            it.platform = target.platform
-        }
-        return target
-    }
-
-    private fun buildNativeMainRunTasks(gradleTarget: Named): Collection<KotlinNativeMainRunTask> {
-        val executableBinaries = (gradleTarget::class.java.getMethodOrNull("getBinaries")?.invoke(gradleTarget) as? Collection<Any>)
-            ?.filter { it.javaClass.name == "org.jetbrains.kotlin.gradle.plugin.mpp.Executable" } ?: return emptyList()
-        return executableBinaries.mapNotNull { binary ->
-            val runTaskName = binary::class.java.getMethod("getRunTaskName").invoke(binary) as String? ?: return@mapNotNull null
-            val entryPoint = binary::class.java.getMethod("getEntryPoint").invoke(binary) as String? ?: return@mapNotNull null
-            val debuggable = binary::class.java.getMethod("getDebuggable").invoke(binary) as Boolean
-
-            val compilationName = binary.javaClass.getMethodOrNull("getCompilation")?.invoke(binary)?.let {
-                it.javaClass.getMethodOrNull("getCompilationName")?.invoke(it)?.toString()
-            } ?: KotlinCompilation.MAIN_COMPILATION_NAME
-
-            KotlinNativeMainRunTaskImpl(
-                runTaskName,
-                compilationName,
-                entryPoint,
-                debuggable
-            )
-        }
-    }
-
-    private fun Named.testTaskClass(className: String) = try {
-        // This is a workaround that makes assumptions about the tasks naming logic
-        // and is therefore an unstable and temporary solution until test runs API is implemented:
-        @Suppress("UNCHECKED_CAST")
-        this.javaClass.classLoader.loadClass(className) as Class<out Task>
-    } catch (_: ClassNotFoundException) {
-        null
-    }
-
-    private fun buildTestRunTasks(project: Project, gradleTarget: Named): Collection<KotlinTestRunTask> {
-        val getTestRunsMethod = gradleTarget.javaClass.getMethodOrNull("getTestRuns")
-        if (getTestRunsMethod != null) {
-            val testRuns = getTestRunsMethod.invoke(gradleTarget) as? Iterable<Any>
-            if (testRuns != null) {
-                val testReports =
-                    testRuns.mapNotNull { (it.javaClass.getMethodOrNull("getExecutionTask")?.invoke(it) as? TaskProvider<Task>)?.get() }
-                val testTasks = testReports.flatMap {
-                    ((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Any>)?.mapNotNull {
-                        //TODO(auskov): getTestTasks should return collection of TaskProviders without mixing with Tasks
-                        when (it) {
-                            is Provider<*> -> it.get() as? Task
-                            is Task -> it
-                            else -> null
-                        }
-                    }) ?: listOf(it)
-                }
-                return testTasks.filter { it.enabled }.map {
-                    val name = it.name
-                    val compilation = it.javaClass.getMethodOrNull("getCompilation")?.invoke(it)
-                    val compilationName = compilation?.javaClass?.getMethodOrNull("getCompilationName")?.invoke(compilation)?.toString()
-                        ?: KotlinCompilation.TEST_COMPILATION_NAME
-                    KotlinTestRunTaskImpl(name, compilationName)
-                }.toList()
-            }
-            return emptyList()
-        }
-
-        // Otherwise, find the Kotlin/JVM test task with names matching the target name or
-        // aggregate Android JVM tasks (like testDebugUnitTest).
-        val kotlinTestTaskClass = gradleTarget.testTaskClass("org.jetbrains.kotlin.gradle.tasks.KotlinTest") ?: return emptyList()
-
-        val targetDisambiguationClassifier = run {
-            val getDisambiguationClassifier = gradleTarget.javaClass.getMethodOrNull("getDisambiguationClassifier")
-                ?: return emptyList()
-
-            getDisambiguationClassifier(gradleTarget) as String?
-        }
-
-        // The 'targetName' of a test task matches the target disambiguation classifier, potentially with suffix, e.g. jsBrowser
-        val getTargetName = kotlinTestTaskClass.getDeclaredMethodOrNull("getTargetName") ?: return emptyList()
-
-        val jvmTestTaskClass =
-            gradleTarget.testTaskClass("org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest") ?: return emptyList()
-        val getJvmTargetName = jvmTestTaskClass.getDeclaredMethodOrNull("getTargetName") ?: return emptyList()
-
-        if (targetDisambiguationClassifier == "android") {
-            val androidUnitTestClass = gradleTarget.testTaskClass("com.android.build.gradle.tasks.factory.AndroidUnitTest")
-                ?: return emptyList()
-
-            return project.tasks.filter { androidUnitTestClass.isInstance(it) }.mapNotNull { task -> task.name }
-                .map { KotlinTestRunTaskImpl(it, KotlinCompilation.TEST_COMPILATION_NAME) }
+        return projectTargets.mapNotNull {
+            KotlinTargetBuilder.buildComponent(KotlinTargetReflection(it), importingContext)
         }
-
-        return project.tasks.filter { kotlinTestTaskClass.isInstance(it) || jvmTestTaskClass.isInstance(it) }.mapNotNull { task ->
-            val testTaskDisambiguationClassifier =
-                (if (kotlinTestTaskClass.isInstance(task)) getTargetName(task) else getJvmTargetName(task)) as String?
-            task.name.takeIf {
-                targetDisambiguationClassifier.isNullOrEmpty() ||
-                        testTaskDisambiguationClassifier != null &&
-                        testTaskDisambiguationClassifier.startsWith(targetDisambiguationClassifier.orEmpty())
-            }
-        }.map { KotlinTestRunTaskImpl(it, KotlinCompilation.TEST_COMPILATION_NAME) }
-    }
-
-    private fun buildTargetJar(gradleTarget: Named, project: Project): KotlinTargetJar? {
-        val targetClass = gradleTarget.javaClass
-        val getArtifactsTaskName = targetClass.getMethodOrNull("getArtifactsTaskName") ?: return null
-        val artifactsTaskName = getArtifactsTaskName(gradleTarget) as? String ?: return null
-        val jarTask = project.tasks.findByName(artifactsTaskName) ?: return null
-        val jarTaskClass = jarTask.javaClass
-        val getArchivePath = jarTaskClass.getMethodOrNull("getArchivePath")
-        val archiveFile = getArchivePath?.invoke(jarTask) as? File?
-        return KotlinTargetJarImpl(archiveFile)
-    }
-
-    private fun buildCompilation(
-        importingContext: MultiplatformModelImportingContext,
-        gradleCompilation: Named,
-        platform: KotlinPlatform,
-        classifier: String?,
-        dependencyResolver: DependencyResolver,
-        dependencyMapper: KotlinDependencyMapper
-    ): KotlinCompilationImpl? {
-        val compilationClass = gradleCompilation.javaClass
-        val getKotlinSourceSets = compilationClass.getMethodOrNull("getKotlinSourceSets") ?: return null
-
-        @Suppress("UNCHECKED_CAST")
-        val kotlinGradleSourceSets = (getKotlinSourceSets(gradleCompilation) as? Collection<Named>) ?: return null
-        val kotlinSourceSets = kotlinGradleSourceSets.mapNotNull { importingContext.sourceSetByName(it.name) }
-        val compileKotlinTask = gradleCompilation.getCompileKotlinTaskName(importingContext.project) ?: return null
-        val output = buildCompilationOutput(gradleCompilation, compileKotlinTask) ?: return null
-        val dependencies =
-            buildCompilationDependencies(importingContext, gradleCompilation, classifier, dependencyResolver, dependencyMapper)
-        val kotlinTaskProperties = getKotlinTaskProperties(compileKotlinTask, classifier)
-
-        // Get konanTarget (for native compilations only).
-        val konanTarget = compilationClass.getMethodOrNull("getKonanTarget")?.let { getKonanTarget ->
-            val konanTarget = getKonanTarget.invoke(gradleCompilation)
-            konanTarget.javaClass.getMethodOrNull("getName")?.let {
-                it.invoke(konanTarget) as? String
-            }
-        }
-        val nativeExtensions = konanTarget?.let(::KotlinNativeCompilationExtensionsImpl)
-
-        val allSourceSets = kotlinSourceSets
-            .flatMap { sourceSet -> importingContext.resolveAllDependsOnSourceSets(sourceSet) }
-            .union(kotlinSourceSets)
-
-        val cachedArgsInfo = if (compileKotlinTask.isCompilerArgumentAware)
-            buildCachedArgsInfo(compileKotlinTask, importingContext.compilerArgumentsCacheMapper)
-        else
-            buildSerializedArgsInfo(compileKotlinTask, importingContext.compilerArgumentsCacheMapper, logger)
-
-        @Suppress("DEPRECATION_ERROR")
-        return KotlinCompilationImpl(
-            name = gradleCompilation.name,
-            allSourceSets = allSourceSets,
-            declaredSourceSets = if (platform == KotlinPlatform.ANDROID) allSourceSets else kotlinSourceSets,
-            dependencies = dependencies.map { dependencyMapper.getId(it) }.distinct().toTypedArray(),
-            output = output,
-            arguments = KotlinCompilationArgumentsImpl(emptyArray(), emptyArray()),
-            dependencyClasspath = emptyArray(),
-            cachedArgsInfo = cachedArgsInfo,
-            kotlinTaskProperties = kotlinTaskProperties,
-            nativeExtensions = nativeExtensions
-        )
-    }
-
-
-    /**
-     * Returns only those dependencies with RUNTIME scope which are not present with compile scope
-     */
-    private fun Collection<KotlinDependency>.onlyNewDependencies(compileDependencies: Collection<KotlinDependency>): List<KotlinDependency> {
-        val compileDependencyArtefacts =
-            compileDependencies.flatMap { (it as? ExternalProjectDependency)?.projectDependencyArtifacts ?: emptyList() }
-        return this.filter {
-            if (it is ExternalProjectDependency)
-                !(compileDependencyArtefacts.containsAll(it.projectDependencyArtifacts))
-            else
-                true
-        }
-    }
-
-    private fun buildCompilationDependencies(
-        importingContext: MultiplatformModelImportingContext,
-        gradleCompilation: Named,
-        classifier: String?,
-        dependencyResolver: DependencyResolver,
-        dependencyMapper: KotlinDependencyMapper
-    ): Set<KotlinDependency> {
-        return LinkedHashSet<KotlinDependency>().apply {
-            val transformationBuilder = MetadataDependencyTransformationBuilder(gradleCompilation)
-            this += buildDependencies(
-                gradleCompilation,
-                dependencyResolver,
-                "getCompileDependencyConfigurationName",
-                "COMPILE",
-                importingContext.project,
-                transformationBuilder
-            )
-            this += buildDependencies(
-                gradleCompilation,
-                dependencyResolver,
-                "getRuntimeDependencyConfigurationName",
-                "RUNTIME",
-                importingContext.project,
-                transformationBuilder
-            ).onlyNewDependencies(this)
-
-            val sourceSet = importingContext.sourceSetByName(compilationFullName(gradleCompilation.name, classifier))
-            this += sourceSet?.dependencies?.mapNotNull { dependencyMapper.getDependency(it) } ?: emptySet()
-        }
-    }
-
-    private class MetadataDependencyTransformationBuilder(val sourceSet: Any) {
-        val transformationsMethod = sourceSet.javaClass.getMethodOrNull("getDependenciesTransformation", String::class.java)
-
-        class KotlinMetadataDependencyTransformation(
-            val groupId: String?,
-            val moduleName: String,
-            val projectPath: String?,
-            val allVisibleSourceSets: Set<String>,
-            val useFilesForSourceSets: Map<String, Iterable<File>>
-        ) {
-            constructor(
-                transformation: Any,
-                group: Method,
-                module: Method,
-                projectPath: Method,
-                visibleSourceSets: Method,
-                useFilesForSourceSets: Method
-            ) : this(
-                group(transformation) as String?,
-                module(transformation) as String,
-                projectPath(transformation) as String?,
-                visibleSourceSets(transformation) as Set<String>,
-                useFilesForSourceSets(transformation) as Map<String, Iterable<File>>
-            )
-        }
-
-        fun getTransformations(configurationName: String): Collection<KotlinMetadataDependencyTransformation> {
-            val transformations = transformationsMethod?.invoke(sourceSet, configurationName) as? Iterable<Any> ?: return emptyList()
-            val transformationClass = transformations.firstOrNull()?.javaClass
-                ?: return emptyList()
-
-            val getGroupId = transformationClass.getMethodOrNull("getGroupId") ?: return emptyList()
-            val getModuleName = transformationClass.getMethodOrNull("getModuleName") ?: return emptyList()
-            val getProjectPath = transformationClass.getMethodOrNull("getProjectPath") ?: return emptyList()
-            val getAllVisibleSourceSets = transformationClass.getMethodOrNull("getAllVisibleSourceSets") ?: return emptyList()
-            val getUseFilesForSourceSets = transformationClass.getMethodOrNull("getUseFilesForSourceSets") ?: return emptyList()
-
-            return transformations.map { transformation ->
-                KotlinMetadataDependencyTransformation(
-                    transformation,
-                    getGroupId,
-                    getModuleName,
-                    getProjectPath,
-                    getAllVisibleSourceSets,
-                    getUseFilesForSourceSets
-                )
-            }.filter { it.allVisibleSourceSets.isNotEmpty() }
-        }
-    }
-
-
-    private fun buildSourceSetDependencies(
-        gradleSourceSet: Named,
-        dependencyResolver: DependencyResolver,
-        project: Project,
-        androidDeps: Map<String, List<Any>>?
-    ): List<KotlinDependency> {
-        return ArrayList<KotlinDependency>().apply {
-            buildAndroidSourceSetDependencies(androidDeps, gradleSourceSet).let { androidDepsForSourceSet ->
-                if (androidDepsForSourceSet.isNotEmpty()) {
-                    this += androidDepsForSourceSet
-                    return@apply
-                }
-            }
-
-            if (project.skipBuildingMetadataDependenciesForSourceSet(gradleSourceSet)) return@apply
-
-            val transformationBuilder = MetadataDependencyTransformationBuilder(gradleSourceSet)
-            this += buildDependencies(
-                gradleSourceSet, dependencyResolver, "getApiMetadataConfigurationName", "COMPILE", project, transformationBuilder
-            )
-            this += buildDependencies(
-                gradleSourceSet, dependencyResolver, "getImplementationMetadataConfigurationName", "COMPILE", project, transformationBuilder
-            )
-            this += buildDependencies(
-                gradleSourceSet, dependencyResolver, "getCompileOnlyMetadataConfigurationName", "COMPILE", project, transformationBuilder
-            )
-            this += buildDependencies(
-                gradleSourceSet, dependencyResolver, "getRuntimeOnlyMetadataConfigurationName", "RUNTIME", project, transformationBuilder
-            ).onlyNewDependencies(this)
-        }
-    }
-
-    private fun buildIntransitiveSourceSetDependencies(
-        gradleSourceSet: Named,
-        dependencyResolver: DependencyResolver,
-        project: Project
-    ): List<KotlinDependency> {
-        val transformationBuilder = MetadataDependencyTransformationBuilder(gradleSourceSet)
-        return buildDependencies(
-            gradleSourceSet, dependencyResolver, "getIntransitiveMetadataConfigurationName", "COMPILE", project, transformationBuilder
-        ).toList()
-    }
-
-    /**
-     * Building Metadata Dependencies for android-specific source-sets might fail
-     * due to debug & release variants available for the same gradle resolution request.
-     * Luckily, there is no need of building Metadata Dependencies for such case.
-     *
-     * @see KTIJ-20097
-     */
-    private fun Project.skipBuildingMetadataDependenciesForSourceSet(gradleSourceSet: Named): Boolean {
-        val isHMPPEnabled = getProperty(IS_HMPP_ENABLED)
-        if (!isHMPPEnabled) return false
-
-        val sourceSetPlatforms = mutableSetOf<KotlinPlatform>()
-        val targets = getTargets().orEmpty()
-
-        for (target in targets) {
-            val platform = target
-                .get("getPlatformType")
-                ?.get("getName")
-                ?.let { it as? String }
-                ?.let { KotlinPlatform.byId(it) }
-                ?: continue
-
-            for (compilation in target.compilations.orEmpty()) {
-                val allSourceSets = compilation
-                    .get("getAllKotlinSourceSets")
-                    ?.let { it as? Collection<*> }
-                    ?.filterIsInstance<Named>()
-                    ?.toSet()
-                    ?: emptySet()
-
-                if (gradleSourceSet in allSourceSets) {
-                    sourceSetPlatforms.add(platform)
-                }
-            }
-        }
-
-        return sourceSetPlatforms.singleOrNull() == KotlinPlatform.ANDROID
-    }
-
-    private fun buildAndroidSourceSetDependencies(
-        androidDeps: Map<String, List<Any>>?,
-        gradleSourceSet: Named
-    ): Collection<KotlinDependency> {
-        return androidDeps?.get(gradleSourceSet.name)?.mapNotNull { it ->
-            @Suppress("UNCHECKED_CAST")
-            val collection = it["getCollection"] as Set<File>?
-            if (collection == null) {
-                DefaultExternalLibraryDependency().apply {
-                    (id as? DefaultExternalDependencyId)?.apply {
-                        name = it["getName"] as String?
-                        group = it["getGroup"] as String?
-                        version = it["getVersion"] as String?
-                    }
-                    file = it["getJar"] as File? ?: return@mapNotNull null.also {
-                        logger.warn("[sync warning] ${gradleSourceSet.name}: $id does not resolve to a jar")
-                    }
-                    source = it["getSource"] as File?
-                }
-            } else {
-                DefaultFileCollectionDependency(collection)
-            }
-        } ?: emptyList()
-    }
-
-    private fun buildCompilationOutput(
-        gradleCompilation: Named,
-        compileKotlinTask: Task
-    ): KotlinCompilationOutput? {
-        val compilationClass = gradleCompilation.javaClass
-        val getOutput = compilationClass.getMethodOrNull("getOutput") ?: return null
-        val gradleOutput = getOutput(gradleCompilation) ?: return null
-        val gradleOutputClass = gradleOutput.javaClass
-        val getClassesDirs = gradleOutputClass.getMethodOrNull("getClassesDirs") ?: return null
-        val getResourcesDir = gradleOutputClass.getMethodOrNull("getResourcesDir") ?: return null
-        val compileKotlinTaskClass = compileKotlinTask.javaClass
-        val getDestinationDir = compileKotlinTaskClass.getMethodOrNull("getDestinationDir")
-        val getOutputFile = compileKotlinTaskClass.getMethodOrNull("getOutputFile")
-        val classesDirs = getClassesDirs(gradleOutput) as? FileCollection ?: return null
-        val resourcesDir = getResourcesDir(gradleOutput) as? File ?: return null
-        @Suppress("UNCHECKED_CAST") val destinationDir =
-            getDestinationDir?.invoke(compileKotlinTask) as? File
-            //TODO: Hack for KotlinNativeCompile
-                ?: (getOutputFile?.invoke(compileKotlinTask) as? Property<File>)?.orNull?.parentFile
-                ?: return null
-        return KotlinCompilationOutputImpl(classesDirs.files, destinationDir, resourcesDir)
     }
 
     private fun computeSourceSetsDeferredInfo(importingContext: MultiplatformModelImportingContext) {
@@ -795,16 +153,16 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
             if (!importingContext.getProperty(IS_HMPP_ENABLED)) {
                 val name = sourceSet.name
                 if (name == COMMON_MAIN_SOURCE_SET_NAME) {
-                    sourceSet.isTestModule = false
+                    sourceSet.isTestComponent = false
                     continue
                 }
                 if (name == COMMON_TEST_SOURCE_SET_NAME) {
-                    sourceSet.isTestModule = true
+                    sourceSet.isTestComponent = true
                     continue
                 }
             }
 
-            sourceSet.isTestModule = importingContext.compilationsBySourceSet(sourceSet)?.all { it.isTestModule } ?: false
+            sourceSet.isTestComponent = importingContext.compilationsBySourceSet(sourceSet)?.all { it.isTestComponent } ?: false
 
             importingContext.computeSourceSetPlatforms(sourceSet)
         }
@@ -861,133 +219,7 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
         }
     }
 
-    private class DependencyAdjuster(
-        private val configuration: Configuration,
-        private val scope: String,
-        private val project: Project,
-        transformations: Collection<MetadataDependencyTransformationBuilder.KotlinMetadataDependencyTransformation>
-    ) {
-        private val adjustmentMap = HashMap<ExternalDependency, List<ExternalDependency>>()
-
-        private val EXTRA_DEFAULT_CONFIGURATION_NAMES = listOf("metadataApiElements")
-
-        private val projectDependencyTransformation =
-            transformations.filter { it.projectPath != null }.associateBy { it.projectPath }
-
-        val dependenciesByProjectPath by lazy {
-            configuration
-                .resolvedConfiguration
-                .lenientConfiguration
-                .allModuleDependencies
-                .mapNotNull { dependency ->
-                    val artifact = dependency.moduleArtifacts.firstOrNull {
-                        it.id.componentIdentifier is ProjectComponentIdentifier
-                    } ?: return@mapNotNull null
-                    dependency to artifact
-                }
-                .groupBy { (it.second.id.componentIdentifier as ProjectComponentIdentifier).projectPath }
-        }
-
-        private fun wrapDependency(dependency: ExternalProjectDependency, newConfigurationName: String): ExternalProjectDependency {
-            return DefaultExternalProjectDependency(dependency).apply {
-                this.configurationName = newConfigurationName
-
-                val nestedDependencies = this.dependencies.flatMap { adjustDependency(it) }
-                this.dependencies.clear()
-                this.dependencies.addAll(nestedDependencies)
-            }
-        }
-
-        private val libraryDependencyTransformation =
-            transformations.filter { it.projectPath == null }.associateBy { it.groupId to it.moduleName }
-
-        private fun adjustLibraryDependency(dependency: ExternalDependency, parentScope: String? = null): List<ExternalDependency> =
-            when (dependency) {
-                is ExternalLibraryDependency -> {
-                    val replaceFiles = libraryDependencyTransformation[dependency.id.group to dependency.id.name]?.useFilesForSourceSets
-                    when {
-                        replaceFiles != null -> replaceFiles.flatMap { (sourceSetName, replaceFiles) ->
-                            replaceFiles.map { replaceFile ->
-                                DefaultExternalLibraryDependency(dependency).apply {
-                                    // Transitive dependencies don't have their scope set properly; TODO investigate may be IJ bug?
-                                    scope = dependency.scope ?: parentScope
-
-                                    classifier = sourceSetName
-                                    file = replaceFile
-
-                                    val adjustedDependencies =
-                                        dependency.dependencies.flatMap { adjustDependency(it, dependency.scope ?: parentScope) }
-
-                                    dependencies.clear()
-                                    dependencies.addAll(adjustedDependencies)
-                                }
-                            }
-                        }
-                        else ->
-                            listOf(
-                                // Do nothing but set the correct scope for this dependency if needed and adjust recursively:
-                                DefaultExternalLibraryDependency(dependency).apply {
-                                    scope = dependency.scope ?: parentScope
-
-                                    val adjustedDependencies =
-                                        dependency.dependencies.flatMap { adjustDependency(it, dependency.scope ?: parentScope) }
-
-                                    dependencies.clear()
-                                    dependencies.addAll(adjustedDependencies)
-                                }
-                            )
-                    }
-                }
-                else -> listOf(dependency)
-            }
-
-        fun adjustDependency(dependency: ExternalDependency, parentScope: String? = null): List<ExternalDependency> {
-            return adjustmentMap.getOrPut(dependency) {
-                if (dependency !is ExternalProjectDependency)
-                    return@getOrPut adjustLibraryDependency(dependency, parentScope)
-                if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION &&
-                    !EXTRA_DEFAULT_CONFIGURATION_NAMES.contains(dependency.configurationName)
-                )
-                    return@getOrPut listOf(dependency)
-                val artifacts = dependenciesByProjectPath[dependency.projectPath] ?: return@getOrPut listOf(dependency)
-                val artifactConfiguration = artifacts.mapTo(LinkedHashSet()) {
-                    it.first.configuration
-                }.singleOrNull() ?: return@getOrPut listOf(dependency)
-                val taskGetterName = when (scope) {
-                    "COMPILE" -> "getApiElementsConfigurationName"
-                    "RUNTIME" -> "getRuntimeElementsConfigurationName"
-                    else -> return@getOrPut listOf(dependency)
-                }
-                val dependencyProject =
-                    if (project.rootProject.path == dependency.projectPath)
-                        project.rootProject
-                    else
-                        project.rootProject.getChildProjectByPath(dependency.projectPath)
-
-                val targets = dependencyProject?.getTargets() ?: return@getOrPut listOf(dependency)
-                val gradleTarget = targets.firstOrNull {
-                    val getter = it.javaClass.getMethodOrNull(taskGetterName) ?: return@firstOrNull false
-                    getter(it) == artifactConfiguration
-                } ?: return@getOrPut listOf(dependency)
-                val classifier = gradleTarget.javaClass.getMethodOrNull("getDisambiguationClassifier")?.invoke(gradleTarget) as? String
-                    ?: return@getOrPut listOf(dependency)
-                val platformDependency = if (classifier != KotlinTarget.METADATA_TARGET_NAME) {
-                    wrapDependency(dependency, compilationFullName(KotlinCompilation.MAIN_COMPILATION_NAME, classifier))
-                } else null
-                val commonDependencies = if (dependencyProject.path in projectDependencyTransformation) {
-                    val visibleSourceSets = projectDependencyTransformation.getValue(dependencyProject.path).allVisibleSourceSets
-                    visibleSourceSets.map { sourceSetName -> wrapDependency(dependency, sourceSetName) }
-                } else {
-                    listOf(wrapDependency(dependency, COMMON_MAIN_SOURCE_SET_NAME))
-                }
-                return if (platformDependency != null) listOf(platformDependency) + commonDependencies else commonDependencies
-            }
-        }
-    }
-
     companion object {
-        private val logger = Logging.getLogger(KotlinMPPGradleModelBuilder::class.java)
-        private const val COMPILER_ARGUMENT_AWARE_CLASS = "org.jetbrains.kotlin.gradle.internal.CompilerArgumentAware"
 
         private val DEFAULT_IMPORTING_CHECKERS = listOf(
             OrphanSourceSetImportingChecker
@@ -999,16 +231,5 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService.Ex {
                     it.check(this@collectDiagnostics, this, importingContext)
                 }
             }
-
-        private val Task.isCompilerArgumentAware: Boolean
-            get() = javaClass.classLoader.loadClassOrNull(COMPILER_ARGUMENT_AWARE_CLASS)?.isAssignableFrom(javaClass) ?: false
-    }
-}
-
-private fun Project.getChildProjectByPath(path: String): Project? {
-    var project = this
-    for (name in path.split(":").asSequence().drop(1)) {
-        project = project.childProjects[name] ?: return null
     }
-    return project
-}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelImpl.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelImpl.kt
index 7c158dd95a3e..75b2edb9b413 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelImpl.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinMPPGradleModelImpl.kt
@@ -3,7 +3,6 @@
 package org.jetbrains.kotlin.idea.gradleTooling
 
 import org.gradle.api.tasks.Exec
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.AbstractCompilerArgumentsCacheAware
 import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheAwareImpl
 import org.jetbrains.kotlin.idea.projectModel.*
 import java.io.File
@@ -55,7 +54,7 @@ class KotlinSourceSetImpl(
     override val allDependsOnSourceSets: Set<String>,
     override val additionalVisibleSourceSets: Set<String>,
     actualPlatforms: KotlinPlatformContainerImpl = KotlinPlatformContainerImpl(),
-    isTestModule: Boolean = false
+    isTestComponent: Boolean = false
 ) : KotlinSourceSet {
 
     override val dependencies: Array<KotlinDependencyId> = regularDependencies + intransitiveDependencies
@@ -73,13 +72,13 @@ class KotlinSourceSetImpl(
         additionalVisibleSourceSets = HashSet(kotlinSourceSet.additionalVisibleSourceSets),
         actualPlatforms = KotlinPlatformContainerImpl(kotlinSourceSet.actualPlatforms)
     ) {
-        this.isTestModule = kotlinSourceSet.isTestModule
+        this.isTestComponent = kotlinSourceSet.isTestComponent
     }
 
     override var actualPlatforms: KotlinPlatformContainer = actualPlatforms
         internal set
 
-    override var isTestModule: Boolean = isTestModule
+    override var isTestComponent: Boolean = isTestComponent
         internal set
 
     override fun toString() = name
@@ -183,7 +182,7 @@ data class KotlinCompilationImpl(
         internal set
 
     // TODO: Logic like this is duplicated *and different*
-    override val isTestModule: Boolean
+    override val isTestComponent: Boolean
         get() = name == KotlinCompilation.TEST_COMPILATION_NAME
                 || platform == KotlinPlatform.ANDROID && name.contains("Test")
 
@@ -280,7 +279,7 @@ data class KotlinMPPGradleModelImpl(
     override val extraFeatures: ExtraFeatures,
     override val kotlinNativeHome: String,
     override val dependencyMap: Map<KotlinDependencyId, KotlinDependency>,
-    override val partialCacheAware: CompilerArgumentsCacheAware,
+    override val cacheAware: CompilerArgumentsCacheAware,
     override val kotlinImportingDiagnostics: KotlinImportingDiagnosticsContainer = mutableSetOf()
 ) : KotlinMPPGradleModel {
     constructor(mppModel: KotlinMPPGradleModel, cloningCache: MutableMap<Any, Any>) : this(
@@ -300,9 +299,18 @@ data class KotlinMPPGradleModelImpl(
         ),
         kotlinNativeHome = mppModel.kotlinNativeHome,
         dependencyMap = mppModel.dependencyMap.map { it.key to it.value.deepCopy(cloningCache) }.toMap(),
-        partialCacheAware = CompilerArgumentsCacheAwareImpl(mppModel.partialCacheAware),
+        cacheAware = CompilerArgumentsCacheAwareImpl(mppModel.cacheAware),
         kotlinImportingDiagnostics = mppModel.kotlinImportingDiagnostics.mapTo(mutableSetOf()) { it.deepCopy(cloningCache) }
     )
+
+    @Deprecated(
+        "Use KotlinGradleModel#cacheAware instead", level = DeprecationLevel.ERROR,
+        replaceWith = ReplaceWith("KotlinMPPGradleModel#cacheAware")
+    )
+    @Suppress("OverridingDeprecatedMember")
+    override val partialCacheAware: CompilerArgumentsCacheAware
+        get() = cacheAware
+
 }
 
 class KotlinPlatformContainerImpl() : KotlinPlatformContainer {
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinProjectModelImportingContext.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinProjectModelImportingContext.kt
new file mode 100644
index 000000000000..61349929414d
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/KotlinProjectModelImportingContext.kt
@@ -0,0 +1,15 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinIdeFragmentDependencyResolverReflection
+
+data class KotlinProjectModelImportingContext(
+    val project: Project,
+    val classLoader: ClassLoader,
+    val fragmentCache: KotlinFragmentCache = KotlinFragmentCache.None,
+    val fragmentDependencyResolver: KotlinIdeFragmentDependencyResolverReflection? =
+        KotlinIdeFragmentDependencyResolverReflection.newInstance(project, classLoader)
+)
+
+internal fun KotlinProjectModelImportingContext.withFragmentCache() = copy(fragmentCache = DefaultKotlinFragmentCache())
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/MultiplatformModelImportingContext.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/MultiplatformModelImportingContext.kt
index ca25bdcd8905..34b0b7d08cb1 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/MultiplatformModelImportingContext.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/MultiplatformModelImportingContext.kt
@@ -4,8 +4,17 @@ package org.jetbrains.kotlin.idea.gradleTooling
 
 import org.gradle.api.Project
 import org.jetbrains.kotlin.idea.projectModel.*
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
+import org.jetbrains.plugins.gradle.tooling.util.DependencyResolver
+import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder
+import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl
+
+interface HasDependencyResolver {
+    val dependencyResolver: DependencyResolver
+    val dependencyMapper: KotlinDependencyMapper
+}
 
-internal interface MultiplatformModelImportingContext: KotlinSourceSetContainer {
+interface MultiplatformModelImportingContext : KotlinSourceSetContainer, HasDependencyResolver {
     val project: Project
     val compilerArgumentsCacheMapper: CompilerArgumentsCacheMapper
 
@@ -71,12 +80,17 @@ internal enum class GradleImportProperties(val id: String, val defaultValue: Boo
 
 internal class MultiplatformModelImportingContextImpl(
     override val project: Project,
-    override val compilerArgumentsCacheMapper: CompilerArgumentsCacheMapper
+    override val compilerArgumentsCacheMapper: CompilerArgumentsCacheMapper,
+    modelBuilderContext: ModelBuilderContext
 ) : MultiplatformModelImportingContext {
     /** see [initializeSourceSets] */
     override lateinit var sourceSetsByName: Map<String, KotlinSourceSetImpl>
         private set
 
+    override val dependencyResolver = DependencyResolverImpl(project, false, true, SourceSetCachedFinder(modelBuilderContext))
+    override val dependencyMapper = KotlinDependencyMapper()
+
+
     /** see [initializeCompilations] */
     override lateinit var compilations: Collection<KotlinCompilation>
         private set
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheBranching.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheBranching.kt
deleted file mode 100644
index 5c932c5465ef..000000000000
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheBranching.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.idea.gradleTooling.arguments
-
-import org.gradle.internal.impldep.org.apache.commons.lang.math.RandomUtils
-import org.jetbrains.kotlin.idea.projectModel.CompilerArgumentsCacheMapper
-import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext
-
-interface CompilerArgumentsCacheBranching : CompilerArgumentsCacheMapper {
-    fun branchOffDetachable(isFallbackStrategy: Boolean = false): CompilerArgumentsMapperDetachable
-}
-
-class CompilerArgumentsCacheBranchingImpl(override val cacheOriginIdentifier: Long = RandomUtils.nextLong()) :
-    AbstractCompilerArgumentsCacheMapper(), CompilerArgumentsCacheBranching {
-    override fun branchOffDetachable(isFallbackStrategy: Boolean): CompilerArgumentsMapperDetachable =
-        if (isFallbackStrategy || System.getProperty("idea.kotlin.sync.fallback").toBoolean())
-            CompilerArgumentsMapperDetachableFallback()
-        else
-            CompilerArgumentsMapperDetachableImpl(this)
-
-    override val offset: Int = 0
-}
-
-val CACHE_MAPPER_BRANCHING =
-    ModelBuilderContext.DataProvider<CompilerArgumentsCacheBranching> { _, _ -> CompilerArgumentsCacheBranchingImpl() }
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperDetachable.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperDetachable.kt
index 265a50890eef..1f6c1f0b9196 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperDetachable.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperDetachable.kt
@@ -9,47 +9,9 @@ interface CompilerArgumentsMapperDetachable : CompilerArgumentsCacheMapper {
     fun detachCacheAware(): CompilerArgumentsCacheAware
 }
 
-class CompilerArgumentsMapperDetachableFallback : AbstractCompilerArgumentsCacheMapper(), CompilerArgumentsMapperDetachable {
+class CompilerArgumentsMapperDetachableImpl : AbstractCompilerArgumentsCacheMapper(), CompilerArgumentsMapperDetachable {
     override fun detachCacheAware(): CompilerArgumentsCacheAware =
         CompilerArgumentsCacheAwareImpl(cacheOriginIdentifier, HashMap(cacheByValueMap))
 
     override val cacheOriginIdentifier: Long by lazy { RandomUtils.nextLong() }
-    override val offset: Int = 0
-}
-
-class CompilerArgumentsMapperDetachableImpl(
-    private val masterCacheMapper: AbstractCompilerArgumentsCacheMapper,
-) : AbstractCompilerArgumentsCacheMapper(), CompilerArgumentsMapperDetachable {
-
-    override val offset: Int by lazy {
-        masterCacheMapper.cacheByValueMap.keys.toIntArray().sortedArray().lastOrNull()?.plus(1) ?: 0
-    }
-
-    override fun cacheArgument(arg: String): Int {
-        return if (masterCacheMapper.checkCached(arg)) {
-            val key = masterCacheMapper.cacheArgument(arg)
-            cacheByValueMap[key] = arg
-            valueByCacheMap[arg] = key
-            key
-        } else super.cacheArgument(arg)
-    }
-
-    override val cacheOriginIdentifier: Long by lazy {
-        masterCacheMapper.cacheOriginIdentifier
-    }
-
-    override fun detachCacheAware(): CompilerArgumentsCacheAware {
-        val uniqueKeys = cacheByValueMap.keys - masterCacheMapper.distributeCacheIds().toSet()
-        uniqueKeys.forEach {
-            val key = it
-            val value = cacheByValueMap.getValue(it)
-            masterCacheMapper.cacheByValueMap[key] = value
-            masterCacheMapper.valueByCacheMap[value] = key
-        }
-
-        return CompilerArgumentsCacheAwareImpl(
-            cacheOriginIdentifier,
-            HashMap(uniqueKeys.associateWith { cacheByValueMap.getValue(it) })
-        )
-    }
-}
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperImpl.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperImpl.kt
index ee019f93c03f..ce367dbd4afd 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperImpl.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/arguments/CompilerArgumentsCacheMapperImpl.kt
@@ -3,18 +3,16 @@ package org.jetbrains.kotlin.idea.gradleTooling.arguments
 
 import org.jetbrains.kotlin.idea.projectModel.CompilerArgumentsCacheMapper
 import java.util.*
-import kotlin.random.Random
 
 abstract class AbstractCompilerArgumentsCacheMapper protected constructor() :
     AbstractCompilerArgumentsCacheAware(), CompilerArgumentsCacheMapper {
-    protected abstract val offset: Int
     private var nextId = 0
     final override var cacheByValueMap: HashMap<Int, String> = hashMapOf()
-    var valueByCacheMap: HashMap<String, Int> = hashMapOf()
+    private var valueByCacheMap: HashMap<String, Int> = hashMapOf()
 
     override fun cacheArgument(arg: String): Int {
         if (checkCached(arg)) return valueByCacheMap.getValue(arg)
-        val retVal = offset + nextId
+        val retVal = nextId
         nextId += 1
         return retVal.also {
             cacheByValueMap[it] = arg
@@ -25,7 +23,6 @@ abstract class AbstractCompilerArgumentsCacheMapper protected constructor() :
     override fun checkCached(arg: String): Boolean = valueByCacheMap.containsKey(arg)
 }
 
-data class CompilerArgumentsCacheMapperImpl(override val cacheOriginIdentifier: Long = Random.nextLong()) :
+data class CompilerArgumentsCacheMapperImpl(override val cacheOriginIdentifier: Long = Random().nextLong()) :
     AbstractCompilerArgumentsCacheMapper() {
-    override val offset: Int = 0
 }
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KonanArtifactModelBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KonanArtifactModelBuilder.kt
new file mode 100644
index 000000000000..0efcb7298135
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KonanArtifactModelBuilder.kt
@@ -0,0 +1,43 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KonanArtifactModelImpl
+import org.jetbrains.kotlin.idea.gradleTooling.KonanRunConfigurationModelImpl
+import org.jetbrains.kotlin.idea.gradleTooling.MultiplatformModelImportingContext
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KonanArtifactReflection
+import org.jetbrains.kotlin.idea.projectModel.KonanArtifactModel
+
+object KonanArtifactModelBuilder : KotlinMultiplatformComponentBuilderBase<KonanArtifactModel> {
+    override fun buildComponent(origin: Any, importingContext: MultiplatformModelImportingContext): KonanArtifactModel? {
+        val konanArtifactReflection = KonanArtifactReflection(origin)
+        val executableName = konanArtifactReflection.executableName ?: ""
+        val outputKind = konanArtifactReflection.outputKindType ?: return null
+        val konanTargetName = konanArtifactReflection.konanTargetName ?: error("No arch target found")
+        val outputFile = konanArtifactReflection.outputFile ?: return null
+        val compilationTargetName = konanArtifactReflection.compilationTargetName ?: return null
+        val isTests = konanArtifactReflection.isTests ?: return null
+        val freeCompilerArgs = konanArtifactReflection.freeCompilerArgs.orEmpty().toTypedArray()
+        val linkTaskPath = konanArtifactReflection.linkTaskPath ?: return null
+        val runConfiguration = KonanRunConfigurationModelImpl(konanArtifactReflection.runTask)
+        val exportDependencies = KonanArtifactDependenciesBuilder.buildComponent(origin, importingContext)
+            .map { importingContext.dependencyMapper.getId(it) }.distinct().toTypedArray()
+
+        return KonanArtifactModelImpl(
+            compilationTargetName,
+            executableName,
+            outputKind,
+            konanTargetName,
+            outputFile,
+            linkTaskPath,
+            runConfiguration,
+            isTests,
+            freeCompilerArgs,
+            exportDependencies
+        )
+    }
+
+    private object KonanArtifactDependenciesBuilder : KotlinMultiplatformDependenciesBuilder() {
+        override val configurationNameAccessor: String = "getExportConfigurationName"
+        override val scope: String = "COMPILE"
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationBuilder.kt
new file mode 100644
index 000000000000..e0d4931db258
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationBuilder.kt
@@ -0,0 +1,110 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.gradle.api.Task
+import org.gradle.api.logging.Logging
+import org.jetbrains.kotlin.idea.gradleTooling.*
+import org.jetbrains.kotlin.idea.gradleTooling.arguments.buildCachedArgsInfo
+import org.jetbrains.kotlin.idea.gradleTooling.arguments.buildSerializedArgsInfo
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinCompilationOutputReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinCompilationReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinNativeCompileReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
+import org.jetbrains.kotlin.idea.projectModel.KotlinCompilationOutput
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+
+class KotlinCompilationBuilder(val platform: KotlinPlatform, val classifier: String?) :
+    KotlinModelComponentBuilder<KotlinCompilationReflection, MultiplatformModelImportingContext, KotlinCompilation> {
+
+    override fun buildComponent(
+        origin: KotlinCompilationReflection,
+        importingContext: MultiplatformModelImportingContext
+    ): KotlinCompilationImpl? {
+        val compilationName = origin.compilationName
+        val kotlinGradleSourceSets = origin.sourceSets ?: return null
+        val kotlinSourceSets = kotlinGradleSourceSets.mapNotNull { importingContext.sourceSetByName(it.name) }
+        val compileKotlinTask = origin.compileKotlinTaskName
+            ?.let { importingContext.project.tasks.findByName(it) }
+            ?: return null
+
+        val output = origin.compilationOutput?.let { buildCompilationOutput(it, compileKotlinTask) } ?: return null
+        val dependencies = buildCompilationDependencies(importingContext, origin, classifier)
+        val kotlinTaskProperties = getKotlinTaskProperties(compileKotlinTask, classifier)
+
+        val nativeExtensions = origin.konanTargetName?.let(::KotlinNativeCompilationExtensionsImpl)
+
+        val allSourceSets = kotlinSourceSets
+            .flatMap { sourceSet -> importingContext.resolveAllDependsOnSourceSets(sourceSet) }
+            .union(kotlinSourceSets)
+
+        val cachedArgsInfo = if (compileKotlinTask.isCompilerArgumentAware
+            //TODO hotfix for KTIJ-21807.
+            // Remove after proper implementation of org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile#setupCompilerArgs
+            && !compileKotlinTask.isKotlinNativeCompileTask //TODO hotfix for KTIJ-21807. Replace after
+        )
+            buildCachedArgsInfo(compileKotlinTask, importingContext.compilerArgumentsCacheMapper)
+        else
+            buildSerializedArgsInfo(compileKotlinTask, importingContext.compilerArgumentsCacheMapper, logger)
+
+        @Suppress("DEPRECATION_ERROR")
+        return KotlinCompilationImpl(
+            name = compilationName,
+            allSourceSets = allSourceSets,
+            declaredSourceSets = if (platform == KotlinPlatform.ANDROID) allSourceSets else kotlinSourceSets,
+            dependencies = dependencies.map { importingContext.dependencyMapper.getId(it) }.distinct().toTypedArray(),
+            output = output,
+            arguments = KotlinCompilationArgumentsImpl(emptyArray(), emptyArray()),
+            dependencyClasspath = emptyArray(),
+            cachedArgsInfo = cachedArgsInfo,
+            kotlinTaskProperties = kotlinTaskProperties,
+            nativeExtensions = nativeExtensions
+        )
+    }
+
+    companion object {
+        private val logger = Logging.getLogger(KotlinCompilationBuilder::class.java)
+
+        private val compileDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getCompileDependencyConfigurationName"
+            override val scope: String = "COMPILE"
+        }
+
+        private val runtimeDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getRuntimeDependencyConfigurationName"
+            override val scope: String = "RUNTIME"
+        }
+
+        private const val COMPILER_ARGUMENT_AWARE_CLASS = "org.jetbrains.kotlin.gradle.internal.CompilerArgumentAware"
+        private const val KOTLIN_NATIVE_COMPILE_CLASS = "org.jetbrains.kotlin.gradle.tasks.AbstractKotlinNativeCompile"
+
+        private fun buildCompilationDependencies(
+            importingContext: MultiplatformModelImportingContext,
+            compilationReflection: KotlinCompilationReflection,
+            classifier: String?
+        ): Set<KotlinDependency> {
+            return LinkedHashSet<KotlinDependency>().apply {
+                this += compileDependenciesBuilder.buildComponent(compilationReflection.gradleCompilation, importingContext)
+                this += runtimeDependenciesBuilder.buildComponent(compilationReflection.gradleCompilation, importingContext)
+                    .onlyNewDependencies(this)
+
+                val sourceSet = importingContext.sourceSetByName(compilationFullName(compilationReflection.compilationName, classifier))
+                this += sourceSet?.dependencies?.mapNotNull { importingContext.dependencyMapper.getDependency(it) } ?: emptySet()
+            }
+        }
+
+        private fun buildCompilationOutput(
+            kotlinCompilationOutputReflection: KotlinCompilationOutputReflection,
+            compileKotlinTask: Task
+        ): KotlinCompilationOutput? {
+            val compilationOutputBase = KotlinCompilationOutputBuilder.buildComponent(kotlinCompilationOutputReflection) ?: return null
+            val destinationDir = KotlinNativeCompileReflection(compileKotlinTask).destinationDir
+            return KotlinCompilationOutputImpl(compilationOutputBase.classesDirs, destinationDir, compilationOutputBase.resourcesDir)
+        }
+
+        private val Task.isCompilerArgumentAware: Boolean
+            get() = javaClass.classLoader.loadClassOrNull(COMPILER_ARGUMENT_AWARE_CLASS)?.isAssignableFrom(javaClass) ?: false
+        private val Task.isKotlinNativeCompileTask: Boolean
+            get() = javaClass.classLoader.loadClassOrNull(KOTLIN_NATIVE_COMPILE_CLASS)?.isAssignableFrom(javaClass) ?: false
+
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationOutputBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationOutputBuilder.kt
new file mode 100644
index 000000000000..99d071429a99
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinCompilationOutputBuilder.kt
@@ -0,0 +1,16 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinCompilationOutputImpl
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinCompilationOutputReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinCompilationOutput
+
+object KotlinCompilationOutputBuilder : KotlinModelComponentBuilderBase<KotlinCompilationOutputReflection, KotlinCompilationOutput> {
+    override fun buildComponent(origin: KotlinCompilationOutputReflection): KotlinCompilationOutput? {
+        return KotlinCompilationOutputImpl(
+            classesDirs = origin.classesDirs?.toSet() ?: return null,
+            resourcesDir = origin.resourcesDir,
+            effectiveClassesDir = null,
+        )
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinFragmentDependencyResolutionBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinFragmentDependencyResolutionBuilder.kt
new file mode 100644
index 000000000000..fa4aec299af9
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinFragmentDependencyResolutionBuilder.kt
@@ -0,0 +1,54 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinFragmentResolvedBinaryDependency
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinFragmentResolvedSourceDependency
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelImportingContext
+import org.jetbrains.kotlin.idea.gradleTooling.capitalize
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinFragmentReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinIdeFragmentDependencyReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinIdeLocalSourceFragmentDependencyReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinIdeMavenBinaryFragmentDependencyReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragmentResolvedDependency
+
+internal object KotlinFragmentDependencyResolutionBuilder :
+    KotlinProjectModelComponentBuilder<KotlinFragmentReflection, Collection<KotlinFragmentResolvedDependency>> {
+
+    override fun buildComponent(
+        origin: KotlinFragmentReflection, importingContext: KotlinProjectModelImportingContext
+    ): Collection<KotlinFragmentResolvedDependency> {
+        val dependencies = importingContext.fragmentDependencyResolver?.resolveDependencies(origin) ?: return emptyList()
+        return dependencies.mapNotNull { it.toKotlinFragmentResolvedDependencyOrNull() }
+    }
+
+    private fun KotlinIdeFragmentDependencyReflection.toKotlinFragmentResolvedDependencyOrNull(): KotlinFragmentResolvedDependency? {
+        return when (this) {
+            is KotlinIdeLocalSourceFragmentDependencyReflection -> toKotlinFragmentResolvedSourceDependencyOrNull()
+            is KotlinIdeMavenBinaryFragmentDependencyReflection -> toKotlinFragmentResolvedBinaryDependencyOrNull()
+        }
+    }
+
+    // TODO: Handle composite builds (use buildId)
+    private fun KotlinIdeLocalSourceFragmentDependencyReflection.toKotlinFragmentResolvedSourceDependencyOrNull():
+            KotlinFragmentResolvedSourceDependency? {
+        val projectPath = this.projectPath ?: return null
+        val moduleName = this.kotlinModuleName ?: return null
+        val fragmentName = this.kotlinFragmentName ?: return null
+        val dependencyIdPrefix = projectPath.takeIf { it.isNotEmpty() && it != ":" } ?: projectName ?: return null
+        return KotlinFragmentResolvedSourceDependency(
+            "$dependencyIdPrefix:$fragmentName${moduleName.capitalize()}"
+        )
+    }
+
+    private fun KotlinIdeMavenBinaryFragmentDependencyReflection.toKotlinFragmentResolvedBinaryDependencyOrNull():
+            KotlinFragmentResolvedBinaryDependency? {
+        val group = this.mavenGroup ?: return null
+        val module = this.mavenModule ?: return null
+        val version = this.version ?: return null
+
+        val dependencyIdentifier = if (kotlinFragmentName == null) "$group:$module$version"
+        else "$group:$module:$kotlinFragmentName:$version"
+
+        return KotlinFragmentResolvedBinaryDependency(dependencyIdentifier, this.files?.toSet())
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinGradleFragmentBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinGradleFragmentBuilder.kt
new file mode 100644
index 000000000000..aabf75a446ad
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinGradleFragmentBuilder.kt
@@ -0,0 +1,61 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinFragmentImpl
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelImportingContext
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinVariantImpl
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinFragmentReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinVariantReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinFragment
+import org.jetbrains.kotlin.idea.projectModel.KotlinKPMModule.Companion.TEST_MODULE_NAME
+import java.io.File
+
+internal object KotlinGradleFragmentBuilder : KotlinProjectModelComponentBuilder<KotlinFragmentReflection, KotlinFragment> {
+    override fun buildComponent(
+        origin: KotlinFragmentReflection,
+        importingContext: KotlinProjectModelImportingContext
+    ): KotlinFragment? {
+        val fragmentName = origin.fragmentName ?: return null
+        val moduleIdentifier = origin.containingModule?.moduleIdentifier ?: return null
+        val kotlinModuleIdentifier = KotlinModuleIdentifierBuilder.buildComponent(moduleIdentifier) ?: return null
+
+        return importingContext.fragmentCache.withCache(kotlinModuleIdentifier, fragmentName) {
+            val isTestModule = origin.containingModule?.name == TEST_MODULE_NAME
+            val sourceDirs = origin.kotlinSourceSourceRoots?.srcDirs ?: emptySet()
+
+            //TODO replace with a proper way to compute resources
+            val resourceDirs: Set<File> = setOfNotNull(sourceDirs.singleOrNull()?.parentFile?.resolve("resources"))
+
+            val kotlinLanguageSettings = origin.languageSettings?.let { KotlinLanguageSettingsBuilder.buildComponent(it) }
+
+            val directRefinesDependencies = origin.directRefinesDependencies.orEmpty()
+                .mapNotNull { dep -> buildComponent(dep, importingContext) }
+
+            val resolvedDependencies = KotlinFragmentDependencyResolutionBuilder.buildComponent(origin, importingContext)
+
+            val fragment = KotlinFragmentImpl(
+                fragmentName = fragmentName,
+                isTestFragment = isTestModule,
+                moduleIdentifier = kotlinModuleIdentifier,
+                languageSettings = kotlinLanguageSettings,
+                directRefinesFragments = directRefinesDependencies,
+                sourceDirs = sourceDirs,
+                resourceDirs = resourceDirs,
+                resolvedDependencies = resolvedDependencies
+            )
+
+            if (origin is KotlinVariantReflection) {
+                val variantAttributes = origin.variantAttributes.orEmpty()
+                val compilationOutputs = origin.compilationOutputs?.let { KotlinCompilationOutputBuilder.buildComponent(it) }
+
+                return@withCache KotlinVariantImpl(
+                    fragment,
+                    variantAttributes = variantAttributes,
+                    compilationOutputs = compilationOutputs
+                )
+            }
+
+            return@withCache fragment
+        }
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinLanguageSettingsBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinLanguageSettingsBuilder.kt
new file mode 100644
index 000000000000..dca6174c9cd4
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinLanguageSettingsBuilder.kt
@@ -0,0 +1,22 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinLanguageSettingsImpl
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinLanguageSettingsReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinLanguageSettings
+
+object KotlinLanguageSettingsBuilder : KotlinModelComponentBuilderBase<KotlinLanguageSettingsReflection, KotlinLanguageSettings> {
+    override fun buildComponent(origin: KotlinLanguageSettingsReflection): KotlinLanguageSettings {
+        @Suppress("UNCHECKED_CAST")
+        return KotlinLanguageSettingsImpl(
+            languageVersion = origin.languageVersion,
+            apiVersion = origin.apiVersion,
+            isProgressiveMode = origin.progressiveMode ?: false,
+            enabledLanguageFeatures = origin.enabledLanguageFeatures.orEmpty(),
+            optInAnnotationsInUse = origin.optInAnnotationsInUse.orEmpty(),
+            compilerPluginArguments = origin.compilerPluginArguments.orEmpty().toTypedArray(),
+            compilerPluginClasspath = origin.compilerPluginClasspath.orEmpty(),
+            freeCompilerArgs = origin.freeCompilerArgs.orEmpty().toTypedArray()
+        )
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModelComponentBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModelComponentBuilder.kt
new file mode 100644
index 000000000000..90ec2a2d6d86
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModelComponentBuilder.kt
@@ -0,0 +1,40 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinDependency
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelImportingContext
+import org.jetbrains.kotlin.idea.gradleTooling.MultiplatformModelImportingContext
+import org.jetbrains.plugins.gradle.model.ExternalProjectDependency
+
+interface KotlinModelComponentBuilder<TOrigin, TCtx, TRet> {
+    fun buildComponent(origin: TOrigin, importingContext: TCtx): TRet?
+}
+
+interface KotlinModelComponentBuilderBase<TOrigin, TRet> : KotlinModelComponentBuilder<TOrigin, Unit, TRet> {
+    override fun buildComponent(origin: TOrigin, importingContext: Unit): TRet? = buildComponent(origin)
+
+    fun buildComponent(origin: TOrigin): TRet?
+}
+
+interface KotlinMultiplatformComponentBuilder<TOrigin, TRet> :
+    KotlinModelComponentBuilder<TOrigin, MultiplatformModelImportingContext, TRet>
+
+interface KotlinMultiplatformComponentBuilderBase<TRet> :
+    KotlinModelComponentBuilder<Any, MultiplatformModelImportingContext, TRet>
+
+interface KotlinProjectModelComponentBuilder<TOrigin, TRet> :
+    KotlinModelComponentBuilder<TOrigin, KotlinProjectModelImportingContext, TRet>
+
+/**
+ * Returns only those dependencies with RUNTIME scope which are not present with compile scope
+ */
+fun Collection<KotlinDependency>.onlyNewDependencies(compileDependencies: Collection<KotlinDependency>): List<KotlinDependency> {
+    val compileDependencyArtefacts =
+        compileDependencies.flatMap { (it as? ExternalProjectDependency)?.projectDependencyArtifacts ?: emptyList() }
+    return this.filter {
+        if (it is ExternalProjectDependency)
+            !(compileDependencyArtefacts.containsAll(it.projectDependencyArtifacts))
+        else
+            true
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleBuilder.kt
new file mode 100644
index 000000000000..efb0f173269c
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleBuilder.kt
@@ -0,0 +1,18 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinKPMModuleImpl
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelImportingContext
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinModuleReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinKPMModule
+
+object KotlinModuleBuilder : KotlinProjectModelComponentBuilder<KotlinModuleReflection, KotlinKPMModule> {
+    override fun buildComponent(origin: KotlinModuleReflection, importingContext: KotlinProjectModelImportingContext): KotlinKPMModule? {
+        return KotlinKPMModuleImpl(
+            moduleIdentifier = KotlinModuleIdentifierBuilder.buildComponent(origin.moduleIdentifier ?: return null) ?: return null,
+            fragments = origin.fragments.orEmpty().mapNotNull { fragmentReflection ->
+                KotlinGradleFragmentBuilder.buildComponent(fragmentReflection, importingContext)
+            }
+        )
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleIdentifierBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleIdentifierBuilder.kt
new file mode 100644
index 000000000000..60b90edc57d8
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinModuleIdentifierBuilder.kt
@@ -0,0 +1,48 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.gradle.api.logging.Logging
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinLocalModuleIdentifierImpl
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinMavenModuleIdentifierImpl
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinLocalModuleIdentifierReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinMavenModuleIdentifierReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinModuleIdentifierReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinLocalModuleIdentifier
+import org.jetbrains.kotlin.idea.projectModel.KotlinMavenModuleIdentifier
+import org.jetbrains.kotlin.idea.projectModel.KotlinModuleIdentifier
+
+object KotlinModuleIdentifierBuilder : KotlinModelComponentBuilderBase<KotlinModuleIdentifierReflection, KotlinModuleIdentifier> {
+    override fun buildComponent(origin: KotlinModuleIdentifierReflection): KotlinModuleIdentifier? = when (origin) {
+        is KotlinLocalModuleIdentifierReflection -> KotlinLocalModuleIdentifierBuilder.buildComponent(origin)
+        is KotlinMavenModuleIdentifierReflection -> KotlinMavenModuleIdentifierBuilder.buildComponent(origin)
+        else -> {
+            LOGGER.error("Unknown module identifier reflection: \"${origin.javaClass.name}\"")
+            null
+        }
+    }
+
+    private val LOGGER = Logging.getLogger(KotlinModuleIdentifierBuilder.javaClass)
+
+
+    private object KotlinLocalModuleIdentifierBuilder :
+        KotlinModelComponentBuilderBase<KotlinLocalModuleIdentifierReflection, KotlinLocalModuleIdentifier> {
+        override fun buildComponent(origin: KotlinLocalModuleIdentifierReflection): KotlinLocalModuleIdentifier? {
+            return KotlinLocalModuleIdentifierImpl(
+                moduleClassifier = origin.moduleClassifier,
+                buildId = origin.buildId ?: return null,
+                projectId = origin.projectId ?: return null
+            )
+        }
+    }
+
+    private object KotlinMavenModuleIdentifierBuilder :
+        KotlinModelComponentBuilderBase<KotlinMavenModuleIdentifierReflection, KotlinMavenModuleIdentifier> {
+        override fun buildComponent(origin: KotlinMavenModuleIdentifierReflection): KotlinMavenModuleIdentifier? {
+            return KotlinMavenModuleIdentifierImpl(
+                moduleClassifier = origin.moduleClassifier,
+                group = origin.group ?: return null,
+                name = origin.name ?: return null
+            )
+        }
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinMultiplatformDependenciesBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinMultiplatformDependenciesBuilder.kt
new file mode 100644
index 000000000000..84dc7df7f2f5
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinMultiplatformDependenciesBuilder.kt
@@ -0,0 +1,251 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.component.ProjectComponentIdentifier
+import org.jetbrains.kotlin.idea.gradleTooling.*
+import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
+import org.jetbrains.kotlin.idea.projectModel.KotlinSourceSet.Companion.COMMON_MAIN_SOURCE_SET_NAME
+import org.jetbrains.kotlin.idea.projectModel.KotlinTarget
+import org.jetbrains.plugins.gradle.model.*
+import java.io.File
+import java.lang.reflect.Method
+
+abstract class KotlinMultiplatformDependenciesBuilder : KotlinMultiplatformComponentBuilderBase<Collection<KotlinDependency>> {
+    protected abstract val configurationNameAccessor: String
+
+    //TODO replace with enum (COMPILE, RUNTIME)
+    protected abstract val scope: String
+
+    override fun buildComponent(origin: Any, importingContext: MultiplatformModelImportingContext): Collection<KotlinDependency> =
+        buildDependencies(origin, importingContext, MetadataDependencyTransformationBuilder(origin))
+
+    protected fun buildDependencies(
+        origin: Any,
+        importingContext: MultiplatformModelImportingContext,
+        metadataDependencyTransformationBuilder: MetadataDependencyTransformationBuilder
+    ): Collection<KotlinDependency> {
+        val configurationName = origin[configurationNameAccessor] as? String ?: return emptyList()
+        val configuration = importingContext.project.configurations.findByName(configurationName) ?: return emptyList()
+        if (!configuration.isCanBeResolved) return emptyList()
+
+        val dependencyAdjuster = DependencyAdjuster(
+            configuration,
+            scope,
+            importingContext.project,
+            metadataDependencyTransformationBuilder.getTransformations(configurationName)
+        )
+
+        val resolvedDependencies = importingContext.dependencyResolver
+            .resolveDependencies(configuration)
+            .apply {
+                forEach<ExternalDependency?> { (it as? AbstractExternalDependency)?.scope = scope }
+                forEach<ExternalDependency?> {
+                    if (it is DefaultExternalProjectDependency && it.projectDependencyArtifacts !is ArrayList) {
+                        it.projectDependencyArtifacts = ArrayList(it.projectDependencyArtifacts)
+                    }
+                }
+            }
+            .flatMap { dependencyAdjuster.adjustDependency(it) }
+        val singleDependencyFiles = resolvedDependencies.mapNotNullTo(LinkedHashSet()) {
+            (it as? FileCollectionDependency)?.files?.singleOrNull()
+        }
+        // Workaround for duplicated dependencies specified as a file collection (KT-26675)
+        // Drop this code when the issue is fixed in the platform
+        return resolvedDependencies.filter { dependency ->
+            if (dependency !is FileCollectionDependency) return@filter true
+            val files = dependency.files
+            if (files.size <= 1) return@filter true
+            (files.any { it !in singleDependencyFiles })
+        }
+    }
+
+    protected class MetadataDependencyTransformationBuilder(val sourceSet: Any) {
+
+        class KotlinMetadataDependencyTransformation(
+            val groupId: String?,
+            val moduleName: String,
+            val projectPath: String?,
+            val allVisibleSourceSets: Set<String>,
+            val useFilesForSourceSets: Map<String, Iterable<File>>
+        ) {
+            @Suppress("UNCHECKED_CAST")
+            constructor(
+                transformation: Any,
+                group: Method,
+                module: Method,
+                projectPath: Method,
+                visibleSourceSets: Method,
+                useFilesForSourceSets: Method
+            ) : this(
+                group(transformation) as String?,
+                module(transformation) as String,
+                projectPath(transformation) as String?,
+                visibleSourceSets(transformation) as Set<String>,
+                useFilesForSourceSets(transformation) as Map<String, Iterable<File>>
+            )
+        }
+
+        @Suppress("UNCHECKED_CAST")
+        fun getTransformations(configurationName: String): Collection<KotlinMetadataDependencyTransformation> {
+            val transformations = sourceSet["getDependenciesTransformation", configurationName] as? Iterable<Any> ?: return emptyList()
+            val transformationClass = transformations.firstOrNull()?.javaClass ?: return emptyList()
+
+            val getGroupId = transformationClass.getMethodOrNull("getGroupId") ?: return emptyList()
+            val getModuleName = transformationClass.getMethodOrNull("getModuleName") ?: return emptyList()
+            val getProjectPath = transformationClass.getMethodOrNull("getProjectPath") ?: return emptyList()
+            val getAllVisibleSourceSets = transformationClass.getMethodOrNull("getAllVisibleSourceSets") ?: return emptyList()
+            val getUseFilesForSourceSets = transformationClass.getMethodOrNull("getUseFilesForSourceSets") ?: return emptyList()
+
+            return transformations.map { transformation ->
+                KotlinMetadataDependencyTransformation(
+                    transformation,
+                    getGroupId,
+                    getModuleName,
+                    getProjectPath,
+                    getAllVisibleSourceSets,
+                    getUseFilesForSourceSets
+                )
+            }.filter { it.allVisibleSourceSets.isNotEmpty() }
+        }
+    }
+
+    private class DependencyAdjuster(
+        private val configuration: Configuration,
+        private val scope: String,
+        private val project: Project,
+        transformations: Collection<MetadataDependencyTransformationBuilder.KotlinMetadataDependencyTransformation>
+    ) {
+        private val adjustmentMap = HashMap<ExternalDependency, List<ExternalDependency>>()
+
+        private val EXTRA_DEFAULT_CONFIGURATION_NAMES = listOf("metadataApiElements")
+
+        private val projectDependencyTransformation =
+            transformations.filter { it.projectPath != null }.associateBy { it.projectPath }
+
+        val dependenciesByProjectPath by lazy {
+            configuration
+                .resolvedConfiguration
+                .lenientConfiguration
+                .allModuleDependencies
+                .mapNotNull { dependency ->
+                    val artifact = dependency.moduleArtifacts.firstOrNull {
+                        it.id.componentIdentifier is ProjectComponentIdentifier
+                    } ?: return@mapNotNull null
+                    dependency to artifact
+                }
+                .groupBy { (it.second.id.componentIdentifier as ProjectComponentIdentifier).projectPath }
+        }
+
+        private fun wrapDependency(dependency: ExternalProjectDependency, newConfigurationName: String): ExternalProjectDependency {
+            return DefaultExternalProjectDependency(dependency).apply {
+                this.configurationName = newConfigurationName
+
+                val nestedDependencies = this.dependencies.flatMap { adjustDependency(it) }
+                this.dependencies.clear()
+                this.dependencies.addAll(nestedDependencies)
+            }
+        }
+
+        private val libraryDependencyTransformation =
+            transformations.filter { it.projectPath == null }.associateBy { it.groupId to it.moduleName }
+
+        private fun adjustLibraryDependency(dependency: ExternalDependency, parentScope: String? = null): List<ExternalDependency> =
+            when (dependency) {
+                is ExternalLibraryDependency -> {
+                    val replaceFiles = libraryDependencyTransformation[dependency.id.group to dependency.id.name]?.useFilesForSourceSets
+                    when {
+                        replaceFiles != null -> replaceFiles.flatMap { (sourceSetName, replaceFiles) ->
+                            replaceFiles.map { replaceFile ->
+                                DefaultExternalLibraryDependency(dependency).apply {
+                                    // Transitive dependencies don't have their scope set properly; TODO investigate may be IJ bug?
+                                    scope = dependency.scope ?: parentScope
+
+                                    classifier = sourceSetName
+                                    file = replaceFile
+
+                                    val adjustedDependencies =
+                                        dependency.dependencies.flatMap { adjustDependency(it, dependency.scope ?: parentScope) }
+
+                                    dependencies.clear()
+                                    dependencies.addAll(adjustedDependencies)
+                                }
+                            }
+                        }
+                        else ->
+                            listOf(
+                                // Do nothing but set the correct scope for this dependency if needed and adjust recursively:
+                                DefaultExternalLibraryDependency(dependency).apply {
+                                    scope = dependency.scope ?: parentScope
+
+                                    val adjustedDependencies =
+                                        dependency.dependencies.flatMap { adjustDependency(it, dependency.scope ?: parentScope) }
+
+                                    dependencies.clear()
+                                    dependencies.addAll(adjustedDependencies)
+                                }
+                            )
+                    }
+                }
+                else -> listOf(dependency)
+            }
+
+        fun adjustDependency(dependency: ExternalDependency, parentScope: String? = null): List<ExternalDependency> {
+            return adjustmentMap.getOrPut(dependency) {
+                if (dependency !is ExternalProjectDependency)
+                    return@getOrPut adjustLibraryDependency(dependency, parentScope)
+                if (dependency.configurationName != Dependency.DEFAULT_CONFIGURATION &&
+                    !EXTRA_DEFAULT_CONFIGURATION_NAMES.contains(dependency.configurationName)
+                )
+                    return@getOrPut listOf(dependency)
+                val artifacts = dependenciesByProjectPath[dependency.projectPath] ?: return@getOrPut listOf(dependency)
+                val artifactConfiguration = artifacts.mapTo(LinkedHashSet()) {
+                    it.first.configuration
+                }.singleOrNull() ?: return@getOrPut listOf(dependency)
+                val taskGetterName = when (scope) {
+                    "COMPILE" -> "getApiElementsConfigurationName"
+                    "RUNTIME" -> "getRuntimeElementsConfigurationName"
+                    else -> return@getOrPut listOf(dependency)
+                }
+                val dependencyProject =
+                    if (project.rootProject.path == dependency.projectPath)
+                        project.rootProject
+                    else
+                        project.rootProject.getChildProjectByPath(dependency.projectPath)
+
+                val targets = dependencyProject?.getTargets() ?: return@getOrPut listOf(dependency)
+                val gradleTarget = targets.firstOrNull {
+                    val getter = it.javaClass.getMethodOrNull(taskGetterName) ?: return@firstOrNull false
+                    getter(it) == artifactConfiguration
+                } ?: return@getOrPut listOf(dependency)
+                val classifier = gradleTarget.javaClass.getMethodOrNull("getDisambiguationClassifier")?.invoke(gradleTarget) as? String
+                    ?: return@getOrPut listOf(dependency)
+                //TODO(chernyshev) rework this predicate to avoid abstraction leaking
+                val platformDependency = if (classifier != KotlinTarget.METADATA_TARGET_NAME) {
+                    wrapDependency(dependency, compilationFullName(KotlinCompilation.MAIN_COMPILATION_NAME, classifier))
+                } else null
+                val commonDependencies = if (dependencyProject.path in projectDependencyTransformation) {
+                    val visibleSourceSets = projectDependencyTransformation.getValue(dependencyProject.path).allVisibleSourceSets
+                    visibleSourceSets.map { sourceSetName -> wrapDependency(dependency, sourceSetName) }
+                } else {
+                    listOf(wrapDependency(dependency, COMMON_MAIN_SOURCE_SET_NAME))
+                }
+                return if (platformDependency != null) listOf(platformDependency) + commonDependencies else commonDependencies
+            }
+        }
+
+        companion object {
+            private fun Project.getChildProjectByPath(path: String): Project? {
+                var project = this
+                for (name in path.split(":").asSequence().drop(1)) {
+                    project = project.childProjects[name] ?: return null
+                }
+                return project
+            }
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinProjectModelSettingsBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinProjectModelSettingsBuilder.kt
new file mode 100644
index 000000000000..7f4ab2f2136f
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinProjectModelSettingsBuilder.kt
@@ -0,0 +1,15 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelSettings
+import org.jetbrains.kotlin.idea.gradleTooling.KotlinProjectModelSettingsImpl
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinKpmExtensionReflection
+
+object KotlinProjectModelSettingsBuilder : KotlinModelComponentBuilderBase<KotlinKpmExtensionReflection, KotlinProjectModelSettings> {
+    override fun buildComponent(origin: KotlinKpmExtensionReflection): KotlinProjectModelSettings? {
+        return KotlinProjectModelSettingsImpl(
+            coreLibrariesVersion = origin.coreLibrariesVersion ?: return null,
+            explicitApiModeCliOption = origin.explicitApiCliOption
+        )
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinSourceSetProtoBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinSourceSetProtoBuilder.kt
new file mode 100644
index 000000000000..83e6182f6944
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinSourceSetProtoBuilder.kt
@@ -0,0 +1,165 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.gradle.api.Named
+import org.gradle.api.Project
+import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.logging.Logging
+import org.jetbrains.kotlin.idea.gradleTooling.*
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinLanguageSettingsReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinTargetReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinDependencyId
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+import org.jetbrains.plugins.gradle.DefaultExternalDependencyId
+import org.jetbrains.plugins.gradle.model.DefaultExternalLibraryDependency
+import org.jetbrains.plugins.gradle.model.DefaultFileCollectionDependency
+import java.io.File
+
+class KotlinSourceSetProtoBuilder(
+    val androidDeps: Map<String, List<Any>>?,
+    val project: Project
+    ) : KotlinMultiplatformComponentBuilderBase<KotlinSourceSetProto> {
+
+    private val sourceSetsWithoutNeedOfBuildingDependenciesMetadata: Set<Named> by lazy {
+        val isHMPPEnabled = project.getProperty(GradleImportProperties.IS_HMPP_ENABLED)
+        if (!isHMPPEnabled) return@lazy emptySet()
+
+        val sourceSetPlatforms = mutableMapOf<Named, MutableSet<KotlinPlatform>>()
+        val targets = project.getTargets().orEmpty().map(::KotlinTargetReflection)
+
+        for (target in targets) {
+            val platform = target.platformType?.let { KotlinPlatform.byId(it) } ?: continue
+            for (compilation in target.compilations.orEmpty()) {
+                for (sourceSet in compilation.allSourceSets.orEmpty()) {
+                    sourceSetPlatforms.getOrPut(sourceSet) { mutableSetOf() }.add(platform)
+                }
+            }
+        }
+
+        sourceSetPlatforms
+            .filterValues { it.singleOrNull() == KotlinPlatform.ANDROID }
+            .keys
+    }
+
+    override fun buildComponent(origin: Any, importingContext: MultiplatformModelImportingContext): KotlinSourceSetProto? {
+        val gradleSourceSet = origin as Named
+
+        val languageSettings = gradleSourceSet["getLanguageSettings"]
+            ?.let { KotlinLanguageSettingsBuilder.buildComponent(KotlinLanguageSettingsReflection(it)) }
+            ?: return null
+        val sourceDirs = (gradleSourceSet["getKotlin"] as? SourceDirectorySet)?.srcDirs ?: emptySet()
+        val resourceDirs = (gradleSourceSet["getResources"] as? SourceDirectorySet)?.srcDirs ?: emptySet()
+
+        @Suppress("UNCHECKED_CAST")
+        val dependsOnSourceSets = (gradleSourceSet["getDependsOn"] as? Set<Named>)
+            ?.mapTo(LinkedHashSet()) { it.name }
+            ?: emptySet<String>()
+
+
+        val sourceSetDependenciesBuilder: () -> Array<KotlinDependencyId> = {
+            val androidDependenciesForSourceSet = buildAndroidSourceSetDependencies(androidDeps, gradleSourceSet)
+
+            val dependencies = when {
+                androidDependenciesForSourceSet.isNotEmpty() -> androidDependenciesForSourceSet
+                gradleSourceSet in sourceSetsWithoutNeedOfBuildingDependenciesMetadata -> emptyList()
+                else -> buildMetadataDependencies(gradleSourceSet, importingContext)
+            }
+
+            dependencies
+                .map { importingContext.dependencyMapper.getId(it) }
+                .distinct()
+                .toTypedArray()
+        }
+
+        val intransitiveSourceSetDependenciesBuilder: () -> Array<KotlinDependencyId> = {
+            buildIntransitiveSourceSetDependencies(gradleSourceSet, importingContext)
+                .map { importingContext.dependencyMapper.getId(it) }
+                .distinct()
+                .toTypedArray()
+        }
+
+        return KotlinSourceSetProto(
+            name = gradleSourceSet.name,
+            languageSettings = languageSettings,
+            sourceDirs = sourceDirs,
+            resourceDirs = resourceDirs,
+            regularDependencies = sourceSetDependenciesBuilder,
+            intransitiveDependencies = intransitiveSourceSetDependenciesBuilder,
+            dependsOnSourceSets = dependsOnSourceSets,
+            additionalVisibleSourceSets = getAdditionalVisibleSourceSets(importingContext.project, gradleSourceSet)
+        )
+    }
+
+    companion object {
+        private val logger = Logging.getLogger(KotlinSourceSetProtoBuilder::class.java)
+
+        private val apiMetadataDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getApiMetadataConfigurationName"
+            override val scope: String = "COMPILE"
+        }
+
+        private val implementationMetadataDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getImplementationMetadataConfigurationName"
+            override val scope: String = "COMPILE"
+        }
+
+        private val compileOnlyMetadataDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getCompileOnlyMetadataConfigurationName"
+            override val scope: String = "COMPILE"
+        }
+
+        private val runtimeOnlyMetadataDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getRuntimeOnlyMetadataConfigurationName"
+            override val scope: String = "RUNTIME"
+        }
+
+        private val intransitiveMetadataDependenciesBuilder = object : KotlinMultiplatformDependenciesBuilder() {
+            override val configurationNameAccessor: String = "getIntransitiveMetadataConfigurationName"
+            override val scope: String = "COMPILE"
+        }
+
+        private fun buildMetadataDependencies(
+            gradleSourceSet: Named,
+            importingContext: MultiplatformModelImportingContext
+        ): List<KotlinDependency> {
+            return ArrayList<KotlinDependency>().apply {
+                this += apiMetadataDependenciesBuilder.buildComponent(gradleSourceSet, importingContext)
+                this += implementationMetadataDependenciesBuilder.buildComponent(gradleSourceSet, importingContext)
+                this += compileOnlyMetadataDependenciesBuilder.buildComponent(gradleSourceSet, importingContext)
+                this += runtimeOnlyMetadataDependenciesBuilder.buildComponent(gradleSourceSet, importingContext).onlyNewDependencies(this)
+            }
+        }
+
+        private fun buildAndroidSourceSetDependencies(
+            androidDeps: Map<String, List<Any>>?,
+            gradleSourceSet: Named
+        ): Collection<KotlinDependency> {
+            return androidDeps?.get(gradleSourceSet.name)?.mapNotNull { it ->
+                @Suppress("UNCHECKED_CAST")
+                val collection = it["getCollection"] as Set<File>?
+                if (collection == null) {
+                    DefaultExternalLibraryDependency().apply {
+                        (id as? DefaultExternalDependencyId)?.apply {
+                            name = it["getName"] as String?
+                            group = it["getGroup"] as String?
+                            version = it["getVersion"] as String?
+                        }
+                        file = it["getJar"] as File? ?: return@mapNotNull null.also {
+                            logger.warn("[sync warning] ${gradleSourceSet.name}: $id does not resolve to a jar")
+                        }
+                        source = it["getSource"] as File?
+                    }
+                } else {
+                    DefaultFileCollectionDependency(collection)
+                }
+            } ?: emptyList()
+        }
+
+
+        private fun buildIntransitiveSourceSetDependencies(
+            gradleSourceSet: Named,
+            importingContext: MultiplatformModelImportingContext
+        ): List<KotlinDependency> =
+            intransitiveMetadataDependenciesBuilder.buildComponent(gradleSourceSet, importingContext).toList()
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt
new file mode 100644
index 000000000000..64fb6e26637c
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/builders/KotlinTargetBuilder.kt
@@ -0,0 +1,142 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.gradleTooling.builders
+
+import org.gradle.api.Named
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.TaskProvider
+import org.jetbrains.kotlin.idea.gradleTooling.*
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinTargetJarReflection
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinTargetReflection
+import org.jetbrains.kotlin.idea.projectModel.KotlinCompilation
+import org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
+import org.jetbrains.kotlin.idea.projectModel.KotlinTarget
+import org.jetbrains.kotlin.idea.projectModel.KotlinTestRunTask
+
+object KotlinTargetBuilder : KotlinMultiplatformComponentBuilder<KotlinTargetReflection, KotlinTarget> {
+    override fun buildComponent(origin: KotlinTargetReflection, importingContext: MultiplatformModelImportingContext): KotlinTarget? {
+        /* Loading class safely to still support Kotlin Gradle Plugin 1.3.30 */
+        if (origin.isMetadataTargetClass) return null
+
+        val name = origin.targetName
+        val platformId = origin.platformType ?: return null
+        val platform = KotlinPlatform.byId(platformId) ?: return null
+        val disambiguationClassifier = origin.disambiguationClassifier
+        val targetPresetName: String? = origin.presetName
+
+        val compilations = origin.compilations?.mapNotNull {
+            KotlinCompilationBuilder(platform, disambiguationClassifier).buildComponent(it, importingContext)
+        } ?: return null
+        val jar = origin.artifactsTaskName
+            ?.let { importingContext.project.tasks.findByName(it) }
+            ?.let { KotlinTargetJarReflection(it) }
+            ?.let { KotlinTargetJarImpl(it.archiveFile) }
+        val nativeMainRunTasks =
+            if (platform == KotlinPlatform.NATIVE) origin.nativeMainRunTasks.orEmpty().mapNotNull { nativeMainRunReflection ->
+                val taskName = nativeMainRunReflection.taskName ?: return@mapNotNull null
+                val compilationName = nativeMainRunReflection.compilationName ?: return@mapNotNull null
+                val entryPoint = nativeMainRunReflection.entryPoint ?: return@mapNotNull null
+                val debuggable = nativeMainRunReflection.debuggable ?: return@mapNotNull null
+                KotlinNativeMainRunTaskImpl(taskName, compilationName, entryPoint, debuggable)
+            }
+            else emptyList()
+
+        val artifacts = origin.konanArtifacts?.mapNotNull {
+            KonanArtifactModelBuilder.buildComponent(it, importingContext)
+        }.orEmpty()
+
+        val testRunTasks = buildTestRunTasks(importingContext.project, origin.gradleTarget)
+        val target = KotlinTargetImpl(
+            name,
+            targetPresetName,
+            disambiguationClassifier,
+            platform,
+            compilations,
+            testRunTasks,
+            nativeMainRunTasks,
+            jar,
+            artifacts
+        )
+        compilations.forEach {
+            it.disambiguationClassifier = target.disambiguationClassifier
+            it.platform = target.platform
+        }
+        return target
+    }
+
+    private fun Named.testTaskClass(className: String) = try {
+        // This is a workaround that makes assumptions about the tasks naming logic
+        // and is therefore an unstable and temporary solution until test runs API is implemented:
+        @Suppress("UNCHECKED_CAST")
+        this.javaClass.classLoader.loadClass(className) as Class<out Task>
+    } catch (_: ClassNotFoundException) {
+        null
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun buildTestRunTasks(project: Project, gradleTarget: Named): Collection<KotlinTestRunTask> {
+        val getTestRunsMethod = gradleTarget.javaClass.getMethodOrNull("getTestRuns")
+        if (getTestRunsMethod != null) {
+            val testRuns = getTestRunsMethod.invoke(gradleTarget) as? Iterable<Any>
+            if (testRuns != null) {
+                val testReports =
+                    testRuns.mapNotNull { (it.javaClass.getMethodOrNull("getExecutionTask")?.invoke(it) as? TaskProvider<Task>)?.get() }
+                val testTasks = testReports.flatMap {
+                    ((it.javaClass.getMethodOrNull("getTestTasks")?.invoke(it) as? Collection<Any>)?.mapNotNull { testTask ->
+                        //TODO(auskov): getTestTasks should return collection of TaskProviders without mixing with Tasks
+                        when (testTask) {
+                            is Provider<*> -> testTask.get() as? Task
+                            is Task -> testTask
+                            else -> null
+                        }
+                    }) ?: listOf(it)
+                }
+                return testTasks.filter { it.enabled }.map {
+                    val name = it.name
+                    val compilation = it.javaClass.getMethodOrNull("getCompilation")?.invoke(it)
+                    val compilationName = compilation?.javaClass?.getMethodOrNull("getCompilationName")?.invoke(compilation)?.toString()
+                        ?: KotlinCompilation.TEST_COMPILATION_NAME
+                    KotlinTestRunTaskImpl(name, compilationName)
+                }.toList()
+            }
+            return emptyList()
+        }
+
+        // Otherwise, find the Kotlin/JVM test task with names matching the target name or
+        // aggregate Android JVM tasks (like testDebugUnitTest).
+        val kotlinTestTaskClass = gradleTarget.testTaskClass("org.jetbrains.kotlin.gradle.tasks.KotlinTest") ?: return emptyList()
+
+        val targetDisambiguationClassifier = run {
+            val getDisambiguationClassifier = gradleTarget.javaClass.getMethodOrNull("getDisambiguationClassifier")
+                ?: return emptyList()
+
+            getDisambiguationClassifier(gradleTarget) as String?
+        }
+
+        // The 'targetName' of a test task matches the target disambiguation classifier, potentially with suffix, e.g. jsBrowser
+        val getTargetName = kotlinTestTaskClass.getDeclaredMethodOrNull("getTargetName") ?: return emptyList()
+
+        val jvmTestTaskClass =
+            gradleTarget.testTaskClass("org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest") ?: return emptyList()
+        val getJvmTargetName = jvmTestTaskClass.getDeclaredMethodOrNull("getTargetName") ?: return emptyList()
+
+        if (targetDisambiguationClassifier == "android") {
+            val androidUnitTestClass = gradleTarget.testTaskClass("com.android.build.gradle.tasks.factory.AndroidUnitTest")
+                ?: return emptyList()
+
+            return project.tasks.filter { androidUnitTestClass.isInstance(it) }.mapNotNull { task -> task.name }
+                .map { KotlinTestRunTaskImpl(it, KotlinCompilation.TEST_COMPILATION_NAME) }
+        }
+
+        return project.tasks.filter { kotlinTestTaskClass.isInstance(it) || jvmTestTaskClass.isInstance(it) }.mapNotNull { task ->
+            val testTaskDisambiguationClassifier =
+                (if (kotlinTestTaskClass.isInstance(task)) getTargetName(task) else getJvmTargetName(task)) as String?
+            task.name.takeIf {
+                targetDisambiguationClassifier.isNullOrEmpty() ||
+                        testTaskDisambiguationClassifier != null &&
+                        testTaskDisambiguationClassifier.startsWith(targetDisambiguationClassifier)
+            }
+        }.map { KotlinTestRunTaskImpl(it, KotlinCompilation.TEST_COMPILATION_NAME) }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/modelBuilderUtils.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/modelBuilderUtils.kt
index 580d5ed26bee..431d0447a3bc 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/modelBuilderUtils.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/modelBuilderUtils.kt
@@ -20,7 +20,8 @@ operator fun Any?.get(methodName: String, vararg params: Any): Any? {
 
 operator fun Any?.get(methodName: String, paramTypes: List<Class<*>>, params: List<Any?>): Any? {
     if (this == null) return null
-    return this::class.java.getMethodOrNull(methodName, *paramTypes.toTypedArray())?.invoke(this, *params.toTypedArray())
+    return this::class.java.getMethodOrNull(methodName, *paramTypes.toTypedArray())
+        ?.invoke(this, *params.toTypedArray())
 }
 
 fun Project.getTarget(): Named? = project.extensions.findByName("kotlin")?.let { kotlinExt ->
@@ -37,4 +38,5 @@ fun Project.getTargets(): Collection<Named>? = project.extensions.findByName("ko
 val Named.compilations: Collection<Named>?
     get() = (this["getCompilations"] as? NamedDomainObjectContainer<Named>)?.asMap?.values
 
-fun Named.getCompileKotlinTaskName(project: Project): Task? = (this["getCompileKotlinTaskName"] as? String)?.let { project.tasks.findByName(it) }
\ No newline at end of file
+fun Named.getCompileKotlinTaskName(project: Project): Task? =
+    (this["getCompileKotlinTaskName"] as? String)?.let { project.tasks.findByName(it) }
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinArtifactReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinArtifactReflection.kt
new file mode 100644
index 000000000000..2035db8307f7
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinArtifactReflection.kt
@@ -0,0 +1,77 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.Task
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Exec
+import org.jetbrains.kotlin.idea.gradleTooling.loadClassOrNull
+import java.io.File
+
+fun KonanArtifactReflection(konanArtifact: Any): KonanArtifactReflection = KonanArtifactReflectionImpl(konanArtifact)
+
+interface KonanArtifactReflection {
+    val executableName: String?
+    val compilationTargetName: String?
+    val outputKindType: String?
+    val konanTargetName: String?
+    val outputFile: File?
+    val linkTaskPath: String?
+    val runTask: Exec?
+    val isTests: Boolean?
+    val freeCompilerArgs: Collection<String>?
+}
+
+private class KonanArtifactReflectionImpl(private val instance: Any) : KonanArtifactReflection {
+    override val executableName: String? by lazy {
+        instance.callReflectiveGetter("getBaseName", logger)
+    }
+    private val linkTask: Task? by lazy {
+        instance.callReflectiveGetter("getLinkTask", logger)
+    }
+    override val linkTaskPath: String? by lazy {
+        linkTask?.path
+    }
+    override val runTask: Exec? by lazy {
+        if (instance.javaClass.classLoader.loadClassOrNull(NATIVE_EXECUTABLE_CLASS)?.isInstance(instance) == true)
+            instance.callReflectiveGetter("getRunTask", logger)
+        else null
+    }
+
+    override val compilationTargetName: String? by lazy {
+        val compilation = linkTask?.callReflectiveAnyGetter("getCompilation", logger)?.let {
+            when (it) {
+                is Provider<*> -> it.get()
+                else -> it
+            }
+        }
+        compilation?.callReflectiveAnyGetter("getTarget", logger)
+            ?.callReflectiveGetter("getName", logger)
+    }
+    override val outputKindType: String? by lazy {
+        linkTask?.callReflectiveAnyGetter("getOutputKind", logger)
+            ?.callReflectiveGetter("name", logger)
+    }
+    override val konanTargetName: String? by lazy {
+        linkTask?.callReflectiveGetter("getTarget", logger)
+    }
+    override val outputFile: File? by lazy {
+        when (val outputFile = instance.callReflective("getOutputFile", parameters(), returnType<Any>(), logger)) {
+            is Provider<*> -> outputFile.orNull as? File
+            is File -> outputFile
+            else -> null
+        }
+    }
+    override val isTests: Boolean? by lazy {
+        linkTask?.callReflectiveGetter("getProcessTests", logger)
+    }
+
+    override val freeCompilerArgs: Collection<String>? by lazy {
+        linkTask?.callReflectiveAnyGetter("getKotlinOptions", logger)
+            ?.callReflectiveGetter("getFreeCompilerArgs", logger)
+    }
+
+    companion object {
+        private val logger: ReflectionLogger = ReflectionLogger(KonanArtifactReflection::class.java)
+        private const val NATIVE_EXECUTABLE_CLASS = "org.jetbrains.kotlin.gradle.plugin.mpp.Executable"
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationOutputReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationOutputReflection.kt
new file mode 100644
index 000000000000..4e951e06bb2e
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationOutputReflection.kt
@@ -0,0 +1,27 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import java.io.File
+
+fun KotlinCompilationOutputReflection(compilationOutputs: Any): KotlinCompilationOutputReflection =
+    KotlinCompilationOutputReflectionImpl(compilationOutputs)
+
+interface KotlinCompilationOutputReflection {
+    val classesDirs: Iterable<File>?
+    val resourcesDir: File?
+}
+
+private class KotlinCompilationOutputReflectionImpl(private val instance: Any) : KotlinCompilationOutputReflection {
+    override val classesDirs: Iterable<File>? by lazy {
+        instance.callReflectiveGetter("getClassesDirs", logger)
+    }
+    override val resourcesDir: File? by lazy {
+        instance.callReflectiveGetter("getResourcesDir", logger)
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinCompilationOutputReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationReflection.kt
new file mode 100644
index 000000000000..d3552a1d932a
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinCompilationReflection.kt
@@ -0,0 +1,52 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.Named
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+
+fun KotlinCompilationReflection(kotlinCompilation: Any): KotlinCompilationReflection =
+    KotlinCompilationReflectionImpl(kotlinCompilation)
+
+interface KotlinCompilationReflection {
+    val compilationName: String
+    val gradleCompilation: Named
+    val sourceSets: Collection<Named>? // Source Sets that directly added to compilation
+    val allSourceSets: Collection<Named>? // this.sourceSets + their transitive closure through dependsOn relation
+    val compilationOutput: KotlinCompilationOutputReflection?
+    val konanTargetName: String?
+    val compileKotlinTaskName: String?
+}
+
+private class KotlinCompilationReflectionImpl(private val instance: Any) : KotlinCompilationReflection {
+    override val gradleCompilation: Named
+        get() = instance as Named
+
+    override val compilationName: String by lazy {
+        gradleCompilation.name
+    }
+    override val sourceSets: Collection<Named>? by lazy {
+        instance.callReflectiveGetter("getKotlinSourceSets", logger)
+    }
+
+    override val allSourceSets: Collection<Named>? by lazy {
+        instance.callReflectiveGetter("getAllKotlinSourceSets", logger)
+    }
+
+    override val compilationOutput: KotlinCompilationOutputReflection? by lazy {
+        instance.callReflectiveAnyGetter("getOutput", logger)?.let { gradleOutput -> KotlinCompilationOutputReflection(gradleOutput) }
+    }
+
+    // Get konanTarget (for native compilations only).
+    override val konanTargetName: String? by lazy {
+        if (instance.javaClass.getMethodOrNull("getKonanTarget") == null) null
+        else instance.callReflectiveAnyGetter("getKonanTarget", logger)
+            ?.callReflectiveGetter("getName", logger)
+    }
+    override val compileKotlinTaskName: String? by lazy {
+        instance.callReflectiveGetter("getCompileKotlinTaskName", logger)
+    }
+
+    companion object {
+        private val logger: ReflectionLogger = ReflectionLogger(KotlinCompilationReflection::class.java)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinFragmentReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinFragmentReflection.kt
new file mode 100644
index 000000000000..d053c9528717
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinFragmentReflection.kt
@@ -0,0 +1,49 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.file.SourceDirectorySet
+
+fun KotlinFragmentReflection(fragment: Any): KotlinFragmentReflection =
+    KotlinFragmentReflectionImpl(fragment)
+
+sealed interface KotlinFragmentReflection {
+    val fragmentName: String?
+    val containingModule: KotlinModuleReflection?
+    val kotlinSourceSourceRoots: SourceDirectorySet?
+    val directRefinesDependencies: List<KotlinFragmentReflection>?
+    val languageSettings: KotlinLanguageSettingsReflection?
+}
+
+private class KotlinFragmentReflectionImpl(
+    private val instance: Any
+) : KotlinFragmentReflection {
+    override val fragmentName: String? by lazy {
+        instance.callReflectiveGetter("getFragmentName", logger)
+    }
+
+    override val containingModule: KotlinModuleReflection? by lazy {
+        instance.callReflectiveAnyGetter("getContainingModule", logger)?.let { module -> KotlinModuleReflection(module) }
+    }
+
+    override val kotlinSourceSourceRoots: SourceDirectorySet? by lazy {
+        instance.callReflectiveGetter("getKotlinSourceRoots", logger)
+    }
+
+    override val directRefinesDependencies: List<KotlinFragmentReflection>? by lazy {
+        instance.callReflective("getDirectRefinesDependencies", parameters(), returnType<Iterable<Any>>(), logger)?.let { fragments ->
+            fragments.map { fragment -> KotlinFragmentReflection(fragment) }
+        }
+    }
+
+    override val languageSettings: KotlinLanguageSettingsReflection? by lazy {
+        instance.callReflectiveAnyGetter("getLanguageSettings", logger)?.let { languageSettings ->
+            KotlinLanguageSettingsReflection(languageSettings)
+        }
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinFragmentReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeFragmentDependencyReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeFragmentDependencyReflection.kt
new file mode 100644
index 000000000000..ce903d5e55f5
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeFragmentDependencyReflection.kt
@@ -0,0 +1,89 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName", "RemoveExplicitTypeArguments")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.artifacts.component.BuildIdentifier
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinModuleIdentifierReflection.Companion.logger
+import java.io.File
+
+fun KotlinIdeFragmentDependencyReflection(dependency: Any): KotlinIdeFragmentDependencyReflection? {
+    return when (dependency.javaClass.simpleName) {
+        "IdeLocalSourceFragmentDependency" -> KotlinIdeLocalSourceFragmentDependencyReflectionImpl(dependency)
+        "IdeMavenBinaryFragmentDependency" -> KotlinIdeMavenBinaryFragmentDependencyReflectionImpl(dependency)
+        else -> {
+            logger.logIssue("Unknown IdeFragmentDependency class: ${dependency.javaClass.simpleName}")
+            null
+        }
+    }
+}
+
+sealed interface KotlinIdeFragmentDependencyReflection
+
+interface KotlinIdeLocalSourceFragmentDependencyReflection : KotlinIdeFragmentDependencyReflection {
+    val buildId: BuildIdentifier?
+    val projectPath: String?
+    val projectName: String?
+    val kotlinModuleName: String?
+    val kotlinFragmentName: String?
+}
+
+interface KotlinIdeMavenBinaryFragmentDependencyReflection : KotlinIdeFragmentDependencyReflection {
+    val mavenGroup: String?
+    val mavenModule: String?
+    val version: String?
+    val kotlinModuleName: String?
+    val kotlinFragmentName: String?
+    val files: List<File>?
+}
+
+private class KotlinIdeLocalSourceFragmentDependencyReflectionImpl(private val instance: Any) :
+    KotlinIdeLocalSourceFragmentDependencyReflection {
+
+    override val buildId: BuildIdentifier? by lazy {
+        instance.callReflectiveGetter("getBuildId", logger)
+    }
+    override val projectPath: String? by lazy {
+        instance.callReflectiveGetter("getProjectPath", logger)
+    }
+    override val projectName: String? by lazy {
+        instance.callReflectiveGetter("getProjectName", logger)
+    }
+    override val kotlinModuleName: String? by lazy {
+        instance.callReflectiveGetter("getKotlinModuleName", logger)
+    }
+    override val kotlinFragmentName: String? by lazy {
+        instance.callReflectiveGetter("getKotlinFragmentName", logger)
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinIdeLocalSourceFragmentDependencyReflection::class.java)
+    }
+}
+
+private class KotlinIdeMavenBinaryFragmentDependencyReflectionImpl(private val instance: Any) :
+    KotlinIdeMavenBinaryFragmentDependencyReflection {
+    override val mavenGroup: String? by lazy {
+        instance.callReflectiveGetter("getMavenGroup", logger)
+    }
+    override val mavenModule: String? by lazy {
+        instance.callReflectiveGetter("getMavenModule", logger)
+    }
+    override val version: String? by lazy {
+        instance.callReflectiveGetter("getVersion", logger)
+    }
+    override val kotlinModuleName: String? by lazy {
+        instance.callReflective("getKotlinModuleName", parameters(), returnType<String?>(), logger)
+    }
+    override val kotlinFragmentName: String? by lazy {
+        instance.callReflective("getKotlinFragmentName", parameters(), returnType<String?>(), logger)
+    }
+
+    override val files: List<File>? by lazy {
+        instance.callReflective("getFiles", parameters(), returnType<Iterable<File>>(), logger)?.toList()
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinIdeMavenBinaryFragmentDependencyReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeMetadataDependencyResolverReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeMetadataDependencyResolverReflection.kt
new file mode 100644
index 000000000000..d8e008d201c1
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinIdeMetadataDependencyResolverReflection.kt
@@ -0,0 +1,47 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("RemoveExplicitTypeArguments")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+import org.jetbrains.kotlin.idea.gradleTooling.loadClassOrNull
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinIdeFragmentDependencyResolverReflection.Companion.logger
+
+interface KotlinIdeFragmentDependencyResolverReflection {
+    fun resolveDependencies(fragment: KotlinFragmentReflection): List<KotlinIdeFragmentDependencyReflection>?
+
+    companion object {
+        val logger = ReflectionLogger(KotlinIdeFragmentDependencyResolverReflection::class.java)
+
+        fun newInstance(project: Project, classLoader: ClassLoader): KotlinIdeFragmentDependencyResolverReflection? {
+            val clazz = classLoader.loadClassOrNull(
+                "org.jetbrains.kotlin.gradle.plugin.ide.IdeFragmentDependencyResolver"
+            ) ?: run {
+                logger.logIssue("Failed to find 'IdeFragmentDependencyResolver' class")
+                return null
+            }
+
+            val createMethod = clazz.getMethodOrNull("create", Project::class.java) ?: run {
+                logger.logIssue("IdeFragmentDependencyResolver.create method not found")
+                return null
+            }
+
+            return IdeFragmentDependencyResolverReflectionImpl(createMethod.invoke(null, project))
+        }
+    }
+}
+
+private class IdeFragmentDependencyResolverReflectionImpl(private val instance: Any) : KotlinIdeFragmentDependencyResolverReflection {
+    override fun resolveDependencies(fragment: KotlinFragmentReflection): List<KotlinIdeFragmentDependencyReflection>? {
+        return instance.callReflective(
+            "resolveDependencies",
+            parameters(
+                parameter<String>(fragment.containingModule?.name ?: return null),
+                parameter<String>(fragment.fragmentName ?: return null)
+            ),
+            returnType<Iterable<Any>>(),
+            logger
+        )?.mapNotNull { dependency -> KotlinIdeFragmentDependencyReflection(dependency) }
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinKpmExtensionReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinKpmExtensionReflection.kt
new file mode 100644
index 000000000000..2dfd39c83706
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinKpmExtensionReflection.kt
@@ -0,0 +1,36 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+fun KotlinKpmExtensionReflection(extension: Any): KotlinKpmExtensionReflection =
+    KotlinKpmExtensionReflectionImpl(extension)
+
+interface KotlinKpmExtensionReflection {
+    val coreLibrariesVersion: String?
+    val explicitApiCliOption: String?
+    val modules: List<KotlinModuleReflection>?
+}
+
+private class KotlinKpmExtensionReflectionImpl(
+    private val instance: Any
+) : KotlinKpmExtensionReflection {
+
+    override val coreLibrariesVersion: String? by lazy {
+        instance.callReflectiveGetter("getCoreLibrariesVersion", logger)
+    }
+
+    override val explicitApiCliOption: String? by lazy {
+        instance.callReflective("getExplicitApi", parameters(), returnType<Any?>(), logger)
+            ?.callReflectiveGetter("getCliOption", logger)
+    }
+
+    override val modules: List<KotlinModuleReflection>? by lazy {
+        instance.callReflective("getModules", parameters(), returnType<Iterable<Any>>(), logger)
+            ?.map { module -> KotlinModuleReflection(module) }
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinKpmExtensionReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinLanguageSettingsReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinLanguageSettingsReflection.kt
new file mode 100644
index 000000000000..f1405263b4cc
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinLanguageSettingsReflection.kt
@@ -0,0 +1,62 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("RemoveExplicitTypeArguments")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import java.io.File
+import kotlin.reflect.full.memberProperties
+
+fun KotlinLanguageSettingsReflection(languageSettings: Any): KotlinLanguageSettingsReflection =
+    KotlinLanguageSettingsReflectionImpl(languageSettings)
+
+interface KotlinLanguageSettingsReflection {
+    val languageVersion: String?
+    val apiVersion: String?
+    val progressiveMode: Boolean?
+    val enabledLanguageFeatures: Set<String>?
+    val optInAnnotationsInUse: Set<String>?
+    val compilerPluginArguments: List<String>?
+    val compilerPluginClasspath: Set<File>?
+    val freeCompilerArgs: List<String>?
+}
+
+private class KotlinLanguageSettingsReflectionImpl(private val instance: Any) : KotlinLanguageSettingsReflection {
+    override val languageVersion: String? by lazy {
+        instance.callReflective("getLanguageVersion", parameters(), returnType<String?>(), logger)
+    }
+
+    override val apiVersion: String? by lazy {
+        instance.callReflective("getApiVersion", parameters(), returnType<String?>(), logger)
+    }
+
+    override val progressiveMode: Boolean? by lazy {
+        instance.callReflectiveGetter("getProgressiveMode", logger)
+    }
+
+    override val enabledLanguageFeatures: Set<String>? by lazy {
+        instance.callReflective("getEnabledLanguageFeatures", parameters(), returnType<Iterable<String>>(), logger)?.toSet()
+    }
+
+    override val optInAnnotationsInUse: Set<String>? by lazy {
+        val getterName = if (instance::class.memberProperties.any { it.name == "optInAnnotationsInUse" }) "getOptInAnnotationsInUse"
+        else "getExperimentalAnnotationsInUse"
+        instance.callReflective(getterName, parameters(), returnType<Iterable<String>>(), logger)?.toSet()
+    }
+
+    override val compilerPluginArguments: List<String>? by lazy {
+        instance.callReflective("getCompilerPluginArguments", parameters(), returnType<Iterable<String>?>(), logger)?.toList()
+    }
+
+    override val compilerPluginClasspath: Set<File>? by lazy {
+        instance.callReflective("getCompilerPluginClasspath", parameters(), returnType<Iterable<File>?>(), logger)?.toSet()
+    }
+
+    override val freeCompilerArgs: List<String>? by lazy {
+        instance.callReflective("getFreeCompilerArgs", parameters(), returnType<Iterable<String>>(), logger)?.toList()
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinLanguageSettingsReflection::class.java)
+    }
+
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleIdentifierReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleIdentifierReflection.kt
new file mode 100644
index 000000000000..2e2631110070
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleIdentifierReflection.kt
@@ -0,0 +1,71 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName", "RemoveExplicitTypeArguments")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinModuleIdentifierReflection.Companion.logger
+
+fun KotlinModuleIdentifierReflection(moduleIdentifier: Any): KotlinModuleIdentifierReflection? {
+    return when (moduleIdentifier.javaClass.name) {
+        "org.jetbrains.kotlin.project.model.LocalModuleIdentifier" ->
+            KotlinLocalModuleIdentifierReflectionImpl(moduleIdentifier)
+        "org.jetbrains.kotlin.project.model.MavenModuleIdentifier" ->
+            KotlinMavenModuleIdentifierReflectionImpl(moduleIdentifier)
+        else -> {
+            logger.logIssue("Unknown module identifier: \"${moduleIdentifier.javaClass.name}\"")
+            null
+        }
+    }
+}
+
+interface KotlinModuleIdentifierReflection {
+    val moduleClassifier: String?
+
+    companion object {
+        internal val logger = ReflectionLogger(KotlinModuleReflection::class.java)
+    }
+}
+
+interface KotlinLocalModuleIdentifierReflection : KotlinModuleIdentifierReflection {
+    val buildId: String?
+    val projectId: String?
+}
+
+interface KotlinMavenModuleIdentifierReflection : KotlinModuleIdentifierReflection {
+    val group: String?
+    val name: String?
+}
+
+private class KotlinModuleIdentifierReflectionImpl(
+    private val instance: Any
+) : KotlinModuleIdentifierReflection {
+    override val moduleClassifier: String? by lazy {
+        instance.callReflective("getModuleClassifier", parameters(), returnType<String?>(), logger)
+    }
+}
+
+private class KotlinLocalModuleIdentifierReflectionImpl(
+    private val instance: Any
+) : KotlinLocalModuleIdentifierReflection,
+    KotlinModuleIdentifierReflection by KotlinModuleIdentifierReflectionImpl(instance) {
+
+    override val buildId: String? by lazy {
+        instance.callReflectiveGetter("getBuildId", logger)
+    }
+    override val projectId: String? by lazy {
+        instance.callReflectiveGetter("getProjectId", logger)
+    }
+}
+
+private class KotlinMavenModuleIdentifierReflectionImpl(
+    private val instance: Any
+) : KotlinMavenModuleIdentifierReflection,
+    KotlinModuleIdentifierReflection by KotlinModuleIdentifierReflectionImpl(instance) {
+
+    override val group: String? by lazy {
+        instance.callReflectiveGetter("getGroup", logger)
+    }
+    override val name: String? by lazy {
+        instance.callReflectiveGetter("getName", logger)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleReflection.kt
new file mode 100644
index 000000000000..27dc3476aa4d
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinModuleReflection.kt
@@ -0,0 +1,45 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("RemoveExplicitTypeArguments")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+fun KotlinModuleReflection(module: Any): KotlinModuleReflection =
+    KotlinModuleReflectionImpl(module)
+
+interface KotlinModuleReflection {
+    val name: String?
+    val moduleClassifier: String?
+    val moduleIdentifier: KotlinModuleIdentifierReflection?
+    val fragments: List<KotlinFragmentReflection>?
+    val variants: List<KotlinVariantReflection>?
+}
+
+private class KotlinModuleReflectionImpl(private val instance: Any) : KotlinModuleReflection {
+    override val name: String? by lazy {
+        instance.callReflectiveGetter("getName", logger)
+    }
+
+    override val moduleClassifier: String? by lazy {
+        instance.callReflective("getModuleClassifier", parameters(), returnType<String?>(), logger)
+    }
+
+    override val moduleIdentifier: KotlinModuleIdentifierReflection? by lazy {
+        instance.callReflectiveAnyGetter("getModuleIdentifier", logger)?.let { moduleIdentifier ->
+            KotlinModuleIdentifierReflection(moduleIdentifier)
+        }
+    }
+
+    override val fragments: List<KotlinFragmentReflection>? by lazy {
+        instance.callReflective("getFragments", parameters(), returnType<Iterable<Any>>(), logger)
+            ?.map { fragment -> KotlinFragmentReflection(fragment) }
+    }
+
+    override val variants: List<KotlinVariantReflection>? by lazy {
+        instance.callReflective("getVariants", parameters(), returnType<Iterable<Any>>(), logger)
+            ?.map { variant -> KotlinVariantReflection(variant) }
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinModuleReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinNativeCompileReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinNativeCompileReflection.kt
new file mode 100644
index 000000000000..ba86c0c16506
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinNativeCompileReflection.kt
@@ -0,0 +1,32 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Provider
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+import java.io.File
+
+fun KotlinNativeCompileReflection(compileKotlinTask: Any): KotlinNativeCompileReflection =
+    KotlinNativeCompileReflectionImpl(compileKotlinTask)
+
+interface KotlinNativeCompileReflection {
+    val destinationDir: File?
+}
+
+private class KotlinNativeCompileReflectionImpl(private val instance: Any) : KotlinNativeCompileReflection {
+    override val destinationDir: File? by lazy {
+        val instanceClazz = instance::class.java
+        if (instanceClazz.getMethodOrNull("getDestinationDirectory") != null)
+            instance.callReflectiveGetter<DirectoryProperty>("getDestinationDirectory", logger)?.asFile?.get()
+        else instance.callReflectiveGetter("getDestinationDir", logger)
+            ?: when (val outputFile = instance.callReflectiveAnyGetter("getOutputFile", logger)) {
+                is Provider<*> -> outputFile.orNull as? File
+                is File -> outputFile
+                else -> null
+            }?.parentFile
+    }
+
+    companion object {
+        private val logger: ReflectionLogger = ReflectionLogger(KotlinNativeCompileReflection::class.java)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinRunTasksReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinRunTasksReflection.kt
new file mode 100644
index 000000000000..d9b4fe44ad10
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinRunTasksReflection.kt
@@ -0,0 +1,61 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+
+interface KotlinRunTaskReflection {
+    val taskName: String?
+    val compilationName: String?
+
+    companion object {
+        val logger = ReflectionLogger(KotlinRunTaskReflection::class.java)
+    }
+}
+
+interface KotlinTestRunTaskReflection : KotlinRunTaskReflection
+
+private abstract class AbstractKotlinTestRunTaskReflection(private val instance: Any) : KotlinTestRunTaskReflection {
+    override val taskName: String? by lazy {
+        instance.callReflectiveGetter("getName", KotlinRunTaskReflection.logger)
+    }
+    override val compilationName: String? by lazy {
+        if (instance.javaClass.getMethodOrNull("getCompilation") == null)
+            null
+        else instance.callReflectiveAnyGetter("getCompilation", KotlinRunTaskReflection.logger)
+            ?.callReflectiveGetter("getCompilationName", KotlinRunTaskReflection.logger)
+    }
+}
+
+private class KotlinTestRunTaskReflectionImpl(instance: Any) : AbstractKotlinTestRunTaskReflection(instance)
+
+fun KotlinAndroidTestRunTaskReflection(androidUnitTestTask: Any): KotlinAndroidTestRunTaskReflection =
+    KotlinAndroidTestRunTaskReflectionImpl(androidUnitTestTask)
+
+interface KotlinAndroidTestRunTaskReflection : KotlinTestRunTaskReflection
+
+private class KotlinAndroidTestRunTaskReflectionImpl(instance: Any) : AbstractKotlinTestRunTaskReflection(instance),
+                                                                      KotlinAndroidTestRunTaskReflection
+
+fun KotlinNativeMainRunTaskReflection(nativeMainRunTask: Any): KotlinNativeMainRunTaskReflection =
+    KotlinNativeMainRunTaskReflectionImpl(nativeMainRunTask)
+
+interface KotlinNativeMainRunTaskReflection : KotlinRunTaskReflection {
+    val entryPoint: String?
+    val debuggable: Boolean?
+}
+
+private class KotlinNativeMainRunTaskReflectionImpl(private val instance: Any) : KotlinNativeMainRunTaskReflection {
+    override val taskName: String? by lazy {
+        instance.callReflectiveGetter("getRunTaskName", KotlinRunTaskReflection.logger)
+    }
+    override val compilationName: String? by lazy {
+        instance.callReflectiveAnyGetter("getCompilation", KotlinRunTaskReflection.logger)
+            ?.callReflectiveGetter("getCompilationName", KotlinRunTaskReflection.logger)
+    }
+    override val entryPoint: String? by lazy {
+        instance.callReflectiveGetter("getEntryPoint", KotlinRunTaskReflection.logger)
+    }
+    override val debuggable: Boolean? by lazy {
+        instance.callReflectiveGetter("getDebuggable", KotlinRunTaskReflection.logger)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetJarReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetJarReflection.kt
new file mode 100644
index 000000000000..9020427e8796
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetJarReflection.kt
@@ -0,0 +1,26 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.Provider
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+import java.io.File
+
+
+fun KotlinTargetJarReflection(artifactsTask: Any): KotlinTargetJarReflection = KotlinTargetJarReflectionImpl(artifactsTask)
+
+interface KotlinTargetJarReflection {
+    val archiveFile: File?
+}
+
+private class KotlinTargetJarReflectionImpl(private val instance: Any) : KotlinTargetJarReflection {
+    override val archiveFile: File? by lazy {
+        if (instance.javaClass.getMethodOrNull("getArchiveFile") != null) {
+            instance.callReflective("getArchiveFile", parameters(), returnType<Provider<RegularFile>>(), logger)?.orNull?.asFile
+        } else null
+    }
+
+    companion object {
+        private val logger: ReflectionLogger = ReflectionLogger(KotlinTargetJarReflection::class.java)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetReflection.kt
new file mode 100644
index 000000000000..b3ffab4c6b56
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinTargetReflection.kt
@@ -0,0 +1,82 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.Named
+import org.jetbrains.kotlin.idea.gradleTooling.getMethodOrNull
+import org.jetbrains.kotlin.idea.gradleTooling.loadClassOrNull
+
+fun KotlinTargetReflection(kotlinTarget: Any): KotlinTargetReflection = KotlinTargetReflectionImpl(kotlinTarget)
+
+interface KotlinTargetReflection {
+    val isMetadataTargetClass: Boolean
+    val targetName: String
+    val presetName: String?
+    val disambiguationClassifier: String?
+    val platformType: String?
+    val gradleTarget: Named
+    val compilations: Collection<KotlinCompilationReflection>?
+
+    val nativeMainRunTasks: Collection<KotlinNativeMainRunTaskReflection>?
+    val artifactsTaskName: String?
+    val konanArtifacts: Collection<Any>?
+}
+
+private class KotlinTargetReflectionImpl(private val instance: Any) : KotlinTargetReflection {
+    override val gradleTarget: Named
+        get() = instance as Named
+    override val isMetadataTargetClass: Boolean by lazy {
+        val metadataTargetClass =
+            instance.javaClass.classLoader.loadClassOrNull("org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget")
+        metadataTargetClass?.isInstance(instance) == true
+    }
+    override val targetName: String by lazy {
+        gradleTarget.name
+    }
+    override val presetName: String? by lazy {
+        instance.callReflectiveAnyGetter("getPreset", logger)
+            ?.callReflectiveGetter("getName", logger)
+    }
+
+    override val disambiguationClassifier: String? by lazy {
+        val getterConditionMethod = "getUseDisambiguationClassifierAsSourceSetNamePrefix"
+        val useDisambiguationClassifier = if (instance.javaClass.getMethodOrNull(getterConditionMethod) != null)
+            instance.callReflectiveGetter(getterConditionMethod, logger)!!
+        else true
+        instance.callReflectiveGetter(
+            (if (useDisambiguationClassifier) "getDisambiguationClassifier"
+            else "getOverrideDisambiguationClassifierOnIdeImport"), logger
+        )
+    }
+    override val platformType: String? by lazy {
+        instance.callReflectiveAnyGetter("getPlatformType", logger)?.callReflectiveGetter("getName", logger)
+    }
+    override val compilations: Collection<KotlinCompilationReflection>? by lazy {
+        instance.callReflective("getCompilations", parameters(), returnType<Iterable<Any>>(), logger)?.map { compilation ->
+            KotlinCompilationReflection(compilation)
+        }
+    }
+
+    override val nativeMainRunTasks: Collection<KotlinNativeMainRunTaskReflection>? by lazy {
+        val executableClass = instance.javaClass.classLoader.loadClassOrNull(EXECUTABLE_CLASS) ?: return@lazy null
+        instance.callReflective("getBinaries", parameters(), returnType<Iterable<Any>>(), logger)
+            ?.filterIsInstance(executableClass)
+            ?.map { KotlinNativeMainRunTaskReflection(it) }
+    }
+
+    override val artifactsTaskName: String? by lazy {
+        instance.callReflectiveGetter("getArtifactsTaskName", logger)
+    }
+
+    override val konanArtifacts: Collection<Any>? by lazy {
+        if (!instance.javaClass.classLoader.loadClass(KOTLIN_NATIVE_TARGET_CLASS).isInstance(instance))
+            null
+        else
+            instance.callReflective("getBinaries", parameters(), returnType<Iterable<Any?>>(), logger)?.filterNotNull()
+    }
+
+    companion object {
+        private val logger = ReflectionLogger(KotlinTargetReflection::class.java)
+        private const val EXECUTABLE_CLASS = "org.jetbrains.kotlin.gradle.plugin.mpp.Executable"
+        private const val KOTLIN_NATIVE_TARGET_CLASS = "org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget"
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinVariantReflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinVariantReflection.kt
new file mode 100644
index 000000000000..463ce164a761
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/KotlinVariantReflection.kt
@@ -0,0 +1,35 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("FunctionName")
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+fun KotlinVariantReflection(variant: Any): KotlinVariantReflection =
+    KotlinVariantReflectionImpl(variant)
+
+interface KotlinVariantReflection : KotlinFragmentReflection {
+    val variantAttributes: Map<String, String>?
+    val compilationOutputs: KotlinCompilationOutputReflection?
+}
+
+private class KotlinVariantReflectionImpl(private val instance: Any) :
+    KotlinVariantReflection,
+    KotlinFragmentReflection by KotlinFragmentReflection(instance) {
+
+    override val variantAttributes: Map<String, String>? by lazy {
+        instance.callReflective("getVariantAttributes", parameters(), returnType<Map<Any, String>>(), logger)
+            ?.mapNotNull { (key, value) ->
+                key.callReflective("getUniqueName", parameters(), returnType<String>(), logger)?.let { it to value }
+                    ?: return@mapNotNull null
+            }?.toMap()
+    }
+
+    override val compilationOutputs: KotlinCompilationOutputReflection? by lazy {
+        instance.callReflectiveAnyGetter("getCompilationOutputs", logger)?.let { output ->
+            KotlinCompilationOutputReflection(output)
+        }
+    }
+
+    companion object {
+        val logger = ReflectionLogger(KotlinVariantReflection::class.java)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/Reflection.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/Reflection.kt
new file mode 100644
index 000000000000..67f16cbfe58d
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/reflect/Reflection.kt
@@ -0,0 +1,121 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:OptIn(ExperimentalStdlibApi::class)
+
+package org.jetbrains.kotlin.idea.gradleTooling.reflect
+
+import org.gradle.api.logging.Logger
+import org.gradle.api.logging.Logging
+import kotlin.reflect.KClass
+import kotlin.reflect.KType
+import kotlin.reflect.typeOf
+
+internal inline fun <reified T> returnType(): TypeToken<T> = TypeToken.create()
+
+internal inline fun <reified T> parameter(value: T?): Parameter<T> = Parameter(TypeToken.create(), value)
+
+internal fun parameters(vararg parameter: Parameter<*>): ParameterList =
+    if (parameter.isEmpty()) ParameterList.empty else ParameterList(parameter.toList())
+
+internal class TypeToken<T> private constructor(
+    val kotlinType: KType?,
+    val kotlinClass: KClass<*>,
+    val isMarkedNullable: Boolean
+) {
+    override fun toString(): String {
+        return kotlinType?.toString() ?: (kotlinClass.java.name + if (isMarkedNullable) "?" else "")
+    }
+
+    companion object {
+        inline fun <reified T> create(): TypeToken<T> {
+            /* KType is not supported with older versions of Kotlin bundled in old Gradle versions (4.x) */
+            val type = runCatching { typeOf<T>() }.getOrNull()
+
+            val isMarkedNullable = when {
+                type != null -> type.isMarkedNullable
+                else -> null is T
+            }
+
+            return TypeToken(type, T::class, isMarkedNullable)
+        }
+    }
+}
+
+interface ReflectionLogger {
+    fun logIssue(message: String, exception: Throwable? = null)
+}
+
+fun ReflectionLogger(clazz: Class<*>) = ReflectionLogger(Logging.getLogger(clazz))
+
+fun ReflectionLogger(logger: Logger): ReflectionLogger = GradleReflectionLogger(logger)
+
+private class GradleReflectionLogger(private val logger: Logger) : ReflectionLogger {
+    override fun logIssue(message: String, exception: Throwable?) {
+        assert(false) { message }
+        logger.error("[Reflection Error] $message", exception)
+    }
+}
+
+internal class Parameter<T>(
+    /**
+     * Optional, because this is not supported in old Gradle/Kotlin Versions
+     */
+    val typeToken: TypeToken<T>,
+    val value: T?
+)
+
+internal class ParameterList(private val parameters: List<Parameter<*>>) : List<Parameter<*>> by parameters {
+    companion object {
+        val empty = ParameterList(emptyList())
+    }
+}
+
+internal inline fun <reified T> Any.callReflective(
+    methodName: String, parameters: ParameterList, returnTypeToken: TypeToken<T>, logger: ReflectionLogger
+): T? {
+    val parameterClasses = parameters.map { parameter ->
+        /* Ensure using the object representation for primitive types, when marked nullable */
+        if (parameter.typeToken.isMarkedNullable) parameter.typeToken.kotlinClass.javaObjectType
+        else parameter.typeToken.kotlinClass.javaPrimitiveType ?: parameter.typeToken.kotlinClass.java
+    }
+
+    val method = try {
+        this::class.java.getMethod(methodName, *parameterClasses.toTypedArray())
+    } catch (e: Exception) {
+        logger.logIssue("Failed to invoke $methodName on ${this.javaClass.name}", e)
+        return null
+    }
+
+    runCatching {
+        @Suppress("Since15")
+        method.trySetAccessible()
+    }
+
+    val returnValue = try {
+        method.invoke(this, *parameters.map { it.value }.toTypedArray())
+    } catch (t: Throwable) {
+        logger.logIssue("Failed to invoke $methodName on ${this.javaClass.name}", t)
+        return null
+    }
+
+    if (returnValue == null) {
+        if (!returnTypeToken.isMarkedNullable) {
+            logger.logIssue("Method $methodName on ${this.javaClass.name} unexpectedly returned null (expected $returnTypeToken)")
+        }
+        return null
+    }
+
+    if (!returnTypeToken.kotlinClass.javaObjectType.isInstance(returnValue)) {
+        logger.logIssue(
+            "Method $methodName on ${this.javaClass.name} unexpectedly returned ${returnValue.javaClass.name}, which is " +
+                    "not an instance of ${returnTypeToken}"
+        )
+        return null
+    }
+
+    return returnValue as T
+}
+
+internal fun Any.callReflectiveAnyGetter(methodName: String, logger: ReflectionLogger): Any? = callReflectiveGetter<Any>(methodName, logger)
+
+internal inline fun <reified T> Any.callReflectiveGetter(methodName: String, logger: ReflectionLogger): T? =
+    callReflective(methodName, parameters(), returnType<T>(), logger)
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/utils.kt b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/utils.kt
index 649fc1b97988..fc673ebf22b8 100644
--- a/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/utils.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/src/org/jetbrains/kotlin/idea/gradleTooling/utils.kt
@@ -2,6 +2,8 @@
 
 package org.jetbrains.kotlin.idea.gradleTooling
 
+import java.util.*
+
 fun Class<*>.getMethodOrNull(name: String, vararg parameterTypes: Class<*>) =
     try {
         getMethod(name, *parameterTypes)
@@ -28,3 +30,15 @@ fun ClassLoader.loadClassOrNull(name: String): Class<*>? {
 
 fun compilationFullName(simpleName: String, classifier: String?) =
     if (classifier != null) classifier + simpleName.capitalize() else simpleName
+
+fun String.capitalize(): String {
+    /* Default implementation as suggested by 'capitalize' deprecation */
+    if (KotlinVersion.CURRENT.isAtLeast(1, 5)) {
+        return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
+    }
+
+    /* Fallback implementation for older Kotlin versions */
+    if (this.isEmpty()) return this
+    @Suppress("DEPRECATION")
+    return this[0].toUpperCase() + this.drop(1)
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/testSrc/org/jetbrains/kotlin/idea/gradleTooling/CallReflectiveTest.kt b/plugins/kotlin/gradle/gradle-tooling/testSrc/org/jetbrains/kotlin/idea/gradleTooling/CallReflectiveTest.kt
new file mode 100644
index 000000000000..80e1ff07be69
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/testSrc/org/jetbrains/kotlin/idea/gradleTooling/CallReflectiveTest.kt
@@ -0,0 +1,93 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+@file:Suppress("unused")
+
+package org.jetbrains.kotlin.idea.gradleTooling
+
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.*
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+class CallReflectiveTest {
+
+    class TestLogger : ReflectionLogger {
+        val messages = mutableListOf<String>()
+        val exceptions = mutableListOf<Throwable?>()
+
+        override fun logIssue(message: String, exception: Throwable?) {
+            messages.add(message)
+            exceptions.add(exception)
+        }
+    }
+
+    private val logger = TestLogger()
+
+    @Test
+    fun `call get property`() {
+        class Tested(val myProperty: String)
+
+        val instance = Tested("abc")
+        assertEquals("abc", instance.callReflectiveGetter("getMyProperty", logger))
+    }
+
+    @Test
+    fun `call get missing property`() {
+        class Tested(val myProperty: String)
+
+        val instance = Tested("abc")
+        assertNull(instance.callReflectiveGetter("getWrongPropertyName", logger))
+        assertEquals(1, logger.messages.size)
+    }
+
+    @Test
+    fun `call property with wrong return type`() {
+        class Tested(val myProperty: String)
+
+        val instance = Tested("abc")
+        assertNull(instance.callReflective("getMyProperty", parameters(), returnType<Int>(), logger))
+        assertEquals(1, logger.messages.size, "Expected single issue being reported")
+        val message = logger.messages.single()
+        assertTrue("String" in message, "Expected logged message to mention 'String'")
+        assertTrue("Int" in message, "Expected logged message to mention 'Int'")
+    }
+
+    @Test
+    fun `call function`() {
+        class Tested {
+            fun addTwo(value: Int) = value + 2
+            fun minus(first: Int, second: Int) = first - second
+        }
+
+        val instance = Tested()
+        assertEquals(4, instance.callReflective("addTwo", parameters(parameter(2)), returnType<Int>(), logger))
+        assertEquals(0, logger.messages.size)
+
+        assertEquals(3, instance.callReflective("minus", parameters(parameter(6), parameter(3)), returnType<Int>(), logger))
+        assertEquals(0, logger.messages.size)
+    }
+
+    @Test
+    fun `call function with null value (int) parameter`() {
+        class Tested {
+            fun orZero(value: Int?): Int = value ?: 0
+        }
+
+        val instance = Tested()
+        assertEquals(0, instance.callReflective("orZero", parameters(parameter<Int?>(null)), returnType<Int>(), logger))
+        assertEquals(0, logger.messages.size)
+    }
+
+    @Test
+    fun `call function with null value (string) parameter`() {
+        class Tested {
+            fun orEmpty(value: String?) = value ?: ""
+        }
+
+        val instance = Tested()
+        assertEquals("", instance.callReflective("orEmpty", parameters(parameter<String?>(null)), returnType<String>(), logger))
+        assertEquals(0, logger.messages.size)
+    }
+}
+
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/kotlin.gradle.gradle-tooling.tests.iml b/plugins/kotlin/gradle/gradle-tooling/tests/kotlin.gradle.gradle-tooling.tests.iml
index f87cb17e3599..a68e541c169f 100644
--- a/plugins/kotlin/gradle/gradle-tooling/tests/kotlin.gradle.gradle-tooling.tests.iml
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/kotlin.gradle.gradle-tooling.tests.iml
@@ -16,5 +16,8 @@
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlin.gradle.plugin" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin.project.model" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin.gradle.plugin.api" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/test/AbstractKotlinKpmExtensionTest.kt b/plugins/kotlin/gradle/gradle-tooling/tests/test/AbstractKotlinKpmExtensionTest.kt
new file mode 100644
index 000000000000..f218c5e05237
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/test/AbstractKotlinKpmExtensionTest.kt
@@ -0,0 +1,24 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.gradle
+
+import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.testfixtures.ProjectBuilder
+
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
+import org.junit.Before
+
+typealias KotlinKpmExtension = KotlinPm20ProjectExtension
+
+abstract class AbstractKotlinKpmExtensionTest {
+    lateinit var project: ProjectInternal
+        private set
+
+    lateinit var kotlin: KotlinKpmExtension
+
+    @Before
+    fun setup() {
+        project = ProjectBuilder.builder().build() as ProjectInternal
+        project.plugins.apply("org.jetbrains.kotlin.multiplatform.pm20")
+        kotlin = project.extensions.getByName("kotlin") as KotlinKpmExtension
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/test/CompilerArgumentsCacheTest.kt b/plugins/kotlin/gradle/gradle-tooling/tests/test/CompilerArgumentsCacheTest.kt
index 477cab2b7ff8..3dc99f427146 100644
--- a/plugins/kotlin/gradle/gradle-tooling/tests/test/CompilerArgumentsCacheTest.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/test/CompilerArgumentsCacheTest.kt
@@ -1,24 +1,21 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.kotlin.gradle
 
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheBranchingImpl
-import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheHolder
 import org.jetbrains.kotlin.idea.gradleTooling.arguments.CompilerArgumentsCacheMapperImpl
 import org.jetbrains.kotlin.idea.test.testFramework.KtUsefulTestCase
 import org.junit.Before
 import org.junit.Test
 import kotlin.random.Random
 import kotlin.random.nextInt
-import kotlin.test.assertEquals
 
 class CompilerArgumentsCacheTest {
     private lateinit var arguments: List<String>
-    private lateinit var mapper: CompilerArgumentsCacheBranchingImpl
+    private lateinit var mapper: CompilerArgumentsCacheMapperImpl
 
     @Before
     fun setUp() {
         arguments = generateCompilerArgumentsList(Random.nextInt(10..30))
-        mapper = CompilerArgumentsCacheBranchingImpl()
+        mapper = CompilerArgumentsCacheMapperImpl()
     }
 
     @Test
@@ -35,109 +32,6 @@ class CompilerArgumentsCacheTest {
         KtUsefulTestCase.assertContainsElements(cached, arguments)
     }
 
-    @Test
-    fun `test branched detachable has not own cache`() {
-        arguments.forEach { mapper.cacheArgument(it) }
-        val detachableMapper = mapper.branchOffDetachable()
-        KtUsefulTestCase.assertEmpty(detachableMapper.distributeCacheIds().toList())
-    }
-
-    @Test
-    fun `test branched detachable caches in master too`() {
-        val ids = arguments.map { mapper.cacheArgument(it) }
-        val detachableMapper = mapper.branchOffDetachable()
-        val uniqueArg = "*UNIQUE*"
-        val uniqueArgCache = detachableMapper.cacheArgument(uniqueArg)
-        val detachedCacheAware = detachableMapper.detachCacheAware()
-        assert(mapper.checkCached(uniqueArg))
-        assertEquals(mapper.getCached(uniqueArgCache), uniqueArg)
-        KtUsefulTestCase.assertContainsOrdered(mapper.distributeCacheIds().toList(), ids.distinct() + uniqueArgCache)
-        KtUsefulTestCase.assertContainsOrdered(detachedCacheAware.distributeCacheIds().toList(), listOf(uniqueArgCache))
-    }
-
-    @Test
-    fun `test branched detachable does not cache duplicates`() {
-        val arguments = generateCompilerArgumentsList(Random.nextInt(30))
-        val masterMapper = CompilerArgumentsCacheBranchingImpl()
-        arguments.forEach { masterMapper.cacheArgument(it) }
-        val detachableMapper = masterMapper.branchOffDetachable()
-        arguments.forEach { detachableMapper.cacheArgument(it) }
-        val detachedCacheAware = detachableMapper.detachCacheAware()
-        KtUsefulTestCase.assertEmpty(detachedCacheAware.distributeCacheIds().toList())
-    }
-
-    @Test
-    fun `test merged cache matches master cache`() {
-        val firstDetachableMapper = mapper.branchOffDetachable()
-        generateCompilerArgumentsList(Random.nextInt(10..30)).forEach { firstDetachableMapper.cacheArgument(it) }
-        val firstDetachedAware = firstDetachableMapper.detachCacheAware()
-        val secondDetachableMapper = mapper.branchOffDetachable()
-        generateCompilerArgumentsList(Random.nextInt(10..30)).forEach { secondDetachableMapper.cacheArgument(it) }
-        val secondDetachedAware = secondDetachableMapper.detachCacheAware()
-
-        val cacheAwareHolder = CompilerArgumentsCacheHolder()
-        cacheAwareHolder.apply {
-            mergeCacheAware(firstDetachedAware)
-            mergeCacheAware(secondDetachedAware)
-        }
-        val cacheAware = cacheAwareHolder.getCacheAware(mapper.cacheOriginIdentifier)!!
-        val mergedKeys = cacheAware.distributeCacheIds().toList()
-        val mergedValues = mergedKeys.sorted().map { cacheAware.getCached(it)!! }
-        KtUsefulTestCase.assertContainsElements(mergedKeys, mapper.distributeCacheIds().toList())
-        KtUsefulTestCase.assertContainsOrdered(
-            mergedValues,
-            mapper.distributeCacheIds().toList().sorted().map { mapper.getCached(it)!! })
-    }
-
-    @Test
-    fun `test merged cache from different masters`() {
-        val firstDetachableMapper = mapper.branchOffDetachable()
-        generateCompilerArgumentsList(Random.nextInt(10..30)).forEach { firstDetachableMapper.cacheArgument(it) }
-        val firstDetachedAware = firstDetachableMapper.detachCacheAware()
-        val secondMapper = CompilerArgumentsCacheMapperImpl()
-        generateCompilerArgumentsList(Random.nextInt(10..30)).forEach { secondMapper.cacheArgument(it) }
-
-        val cacheAwareHolder = CompilerArgumentsCacheHolder()
-        cacheAwareHolder.apply {
-            mergeCacheAware(firstDetachedAware)
-            mergeCacheAware(secondMapper)
-        }
-        val firstCacheAware = cacheAwareHolder.getCacheAware(mapper.cacheOriginIdentifier)!!
-        var mergedKeys = firstCacheAware.distributeCacheIds().toList()
-        var mergedValues = mergedKeys.sorted().map { firstCacheAware.getCached(it)!! }
-        KtUsefulTestCase.assertContainsElements(mergedKeys, mapper.distributeCacheIds().toList())
-        KtUsefulTestCase.assertContainsOrdered(
-            mergedValues,
-            mapper.distributeCacheIds().toList().sorted().map { mapper.getCached(it)!! }
-        )
-
-        val secondCacheAware = cacheAwareHolder.getCacheAware(secondMapper.cacheOriginIdentifier)!!
-        mergedKeys = secondCacheAware.distributeCacheIds().toList()
-        mergedValues = mergedKeys.sorted().map { secondCacheAware.getCached(it)!! }
-        KtUsefulTestCase.assertContainsElements(mergedKeys, secondMapper.distributeCacheIds().toList())
-        KtUsefulTestCase.assertContainsOrdered(
-            mergedValues,
-            secondMapper.distributeCacheIds().toList().sorted().map { secondMapper.getCached(it)!! }
-        )
-    }
-
-    @Test
-    fun `test detach with fallback strategy`() {
-        val firstMapper = mapper.branchOffDetachable(isFallbackStrategy = true)
-        val arguments = generateCompilerArgumentsList(Random.nextInt(10..30))
-        val cachedArguments1 = arguments.map { firstMapper.cacheArgument(it) }
-        val firstDetachedAware = firstMapper.detachCacheAware()
-        val secondMapper = mapper.branchOffDetachable(isFallbackStrategy = true)
-        val cachedArguments2 = arguments.map { secondMapper.cacheArgument(it) }
-        val secondDetachableAware = secondMapper.detachCacheAware()
-        KtUsefulTestCase.assertContainsOrdered(cachedArguments1, cachedArguments2)
-        KtUsefulTestCase.assertContainsOrdered(
-            firstDetachedAware.distributeCacheIds().toList(),
-            secondDetachableAware.distributeCacheIds().toList()
-        )
-        KtUsefulTestCase.assertEmpty(mapper.distributeCacheIds().toList())
-    }
-
     companion object {
         private val alphabet = listOf('a'..'z', 'A'..'Z').map { it.joinToString(separator = "") }.joinToString(separator = "")
 
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinFragmentReflectionTest.kt b/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinFragmentReflectionTest.kt
new file mode 100644
index 000000000000..ba46b37a5e11
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinFragmentReflectionTest.kt
@@ -0,0 +1,61 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.gradle
+
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinFragmentReflection
+import org.junit.Ignore
+import org.junit.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@Ignore
+class KotlinFragmentReflectionTest : AbstractKotlinKpmExtensionTest() {
+
+    @Test
+    fun `test fragmentName`() {
+        val fragment = kotlin.main.fragments.create("testFragment")
+        val reflection = KotlinFragmentReflection(fragment)
+        assertEquals("testFragment", reflection.fragmentName)
+    }
+
+    @Test
+    fun `test directRefinesDependencies`() {
+        val fragmentA = kotlin.main.fragments.create("a")
+        val fragmentB = kotlin.main.fragments.create("b")
+        fragmentB.refines(fragmentA)
+        val reflectionB = KotlinFragmentReflection(fragmentB)
+
+        assertEquals(
+            fragmentB.directRefinesDependencies.map { it.fragmentName },
+            reflectionB.directRefinesDependencies?.map { it.fragmentName }
+        )
+    }
+
+    @Test
+    fun `test containingModule`() {
+        run {
+            val fragment = kotlin.main.fragments.create("testFragment")
+            assertEquals(
+                kotlin.main.name, KotlinFragmentReflection(fragment).containingModule?.name
+            )
+        }
+
+        run {
+            val fragment = kotlin.test.fragments.create("testFragment")
+            assertEquals(
+                kotlin.test.name, KotlinFragmentReflection(fragment).containingModule?.name
+            )
+        }
+    }
+
+    @Test
+    fun `test kotlinSourceRoots`() {
+        val fragment = kotlin.main.fragments.create("testFragment")
+        assertNotNull(KotlinFragmentReflection(fragment).kotlinSourceSourceRoots)
+    }
+
+    @Test
+    fun `test languageSettings`() {
+        val fragment = kotlin.main.fragments.create("testFragment")
+        assertNotNull(KotlinFragmentReflection(fragment).languageSettings)
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinModuleReflectionTest.kt b/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinModuleReflectionTest.kt
new file mode 100644
index 000000000000..e9178d235069
--- /dev/null
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/test/KotlinModuleReflectionTest.kt
@@ -0,0 +1,41 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.gradle
+
+import org.jetbrains.kotlin.idea.gradleTooling.reflect.KotlinModuleReflection
+import org.junit.Ignore
+import org.junit.Test
+import kotlin.test.assertEquals
+
+@Ignore
+class KotlinModuleReflectionTest : AbstractKotlinKpmExtensionTest() {
+
+    @Test
+    fun `test name`() {
+        assertEquals(kotlin.main.name, KotlinModuleReflection(kotlin.main).name)
+        assertEquals(kotlin.test.name, KotlinModuleReflection(kotlin.test).name)
+    }
+
+    @Test
+    fun `test fragments`() {
+        kotlin.main.fragments.create("fragmentA")
+        kotlin.main.fragments.create("fragmentB")
+
+        assertEquals(
+            kotlin.main.fragments.map { it.fragmentName },
+            KotlinModuleReflection(kotlin.main).fragments?.map { it.fragmentName }
+        )
+    }
+
+    @Test
+    fun `test moduleClassifier`() {
+        assertEquals(
+            kotlin.main.moduleIdentifier.moduleClassifier,
+            KotlinModuleReflection(kotlin.main).moduleClassifier
+        )
+
+        assertEquals(
+            kotlin.test.moduleIdentifier.moduleClassifier,
+            KotlinModuleReflection(kotlin.test).moduleClassifier
+        )
+    }
+}
diff --git a/plugins/kotlin/gradle/gradle-tooling/tests/test/createKotlinMPPGradleModel.kt b/plugins/kotlin/gradle/gradle-tooling/tests/test/createKotlinMPPGradleModel.kt
index cccf50273f40..10c2fbfc014f 100644
--- a/plugins/kotlin/gradle/gradle-tooling/tests/test/createKotlinMPPGradleModel.kt
+++ b/plugins/kotlin/gradle/gradle-tooling/tests/test/createKotlinMPPGradleModel.kt
@@ -20,7 +20,7 @@ internal fun createKotlinMPPGradleModel(
         targets = targets.toList(),
         extraFeatures = extraFeatures,
         kotlinNativeHome = kotlinNativeHome,
-        partialCacheAware = CompilerArgumentsCacheAwareImpl()
+        cacheAware = CompilerArgumentsCacheAwareImpl()
     )
 }
 
diff --git a/plugins/kotlin/groovy/kotlin.groovy.iml b/plugins/kotlin/groovy/kotlin.groovy.iml
index 7f4a4a0ee7b0..cfc17d3e0899 100644
--- a/plugins/kotlin/groovy/kotlin.groovy.iml
+++ b/plugins/kotlin/groovy/kotlin.groovy.iml
@@ -12,7 +12,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.jvm" />
diff --git a/plugins/kotlin/i18n/kotlin.i18n.iml b/plugins/kotlin/i18n/kotlin.i18n.iml
index b76bc893658c..811883177935 100644
--- a/plugins/kotlin/i18n/kotlin.i18n.iml
+++ b/plugins/kotlin/i18n/kotlin.i18n.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
     <orderEntry type="module" module-name="intellij.java.i18n" />
     <orderEntry type="module" module-name="intellij.properties.psi.impl" />
   </component>
diff --git a/plugins/kotlin/i18n/src/org/jetbrains/kotlin/idea/i18n/referenceProviders.kt b/plugins/kotlin/i18n/src/org/jetbrains/kotlin/idea/i18n/referenceProviders.kt
index 2086248b03a9..299d3d5bc922 100644
--- a/plugins/kotlin/i18n/src/org/jetbrains/kotlin/idea/i18n/referenceProviders.kt
+++ b/plugins/kotlin/i18n/src/org/jetbrains/kotlin/idea/i18n/referenceProviders.kt
@@ -17,9 +17,9 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
diff --git a/plugins/kotlin/idea/kotlin.idea.iml b/plugins/kotlin/idea/kotlin.idea.iml
index 977f6c544853..1795d57d90ee 100644
--- a/plugins/kotlin/idea/kotlin.idea.iml
+++ b/plugins/kotlin/idea/kotlin.idea.iml
@@ -36,13 +36,14 @@
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" exported="" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.j2k.old" />
     <orderEntry type="module" module-name="kotlin.j2k.new" />
     <orderEntry type="module" module-name="kotlin.formatter" />
     <orderEntry type="module" module-name="kotlin.j2k.idea" />
     <orderEntry type="module" module-name="kotlin.scripting" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="kotlin.line-indent-provider" exported="" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
diff --git a/plugins/kotlin/idea/resources-en/inspectionDescriptions/AddConversionCallMigration.html b/plugins/kotlin/idea/resources-en/inspectionDescriptions/AddConversionCallMigration.html
new file mode 100644
index 000000000000..edf5ac557c2e
--- /dev/null
+++ b/plugins/kotlin/idea/resources-en/inspectionDescriptions/AddConversionCallMigration.html
@@ -0,0 +1,25 @@
+<html>
+<body>
+<p>Reports expressions that will be of type <code>Int</code>, thus causing compilation errors in Kotlin 1.9 and later.</p>
+
+<p>Example:</p>
+<pre><code>
+  fun takeByte(x: Byte) {}
+
+  fun foo() {
+      takeByte(1 + 1) // will be resolved to Int in 1.9
+  }
+</code></pre>
+
+<p>After the quick-fix is applied:</p>
+<pre><code>
+  fun takeByte(x: Byte) {}
+
+  fun foo() {
+      takeByte((1 + 1).toByte()) // will be resolved to Int in 1.9
+  }
+</code></pre>
+
+<p>Inspection is available for Kotlin language level starting from 1.7.</p>
+</body>
+</html>
diff --git a/plugins/kotlin/idea/resources-en/inspectionDescriptions/AmbiguousExpressionInWhenBranchMigration.html b/plugins/kotlin/idea/resources-en/inspectionDescriptions/AmbiguousExpressionInWhenBranchMigration.html
new file mode 100644
index 000000000000..34a989d5c02d
--- /dev/null
+++ b/plugins/kotlin/idea/resources-en/inspectionDescriptions/AmbiguousExpressionInWhenBranchMigration.html
@@ -0,0 +1,22 @@
+<html>
+<body>
+<p>Reports ambiguous logical expressions in <code>when</code> branches which cause compilation errors in Kotlin 1.8 and later.</p>
+<pre><code>
+  fun Int.matches(strict: Boolean): Boolean = when (strict) {
+      true -> this == 6
+      this in (4..7) -> true // is ambiguous
+      else -> false
+  }
+</code></pre>
+
+<p>After the quick-fix is applied:</p>
+<pre><code>
+  fun Int.matches(strict: Boolean): Boolean = when (strict) {
+      true -> this == 6
+      (this in (4..7)) -> true // wrapped in parentheses
+      else -> false
+  }
+</code></pre>
+<p>Inspection is available for Kotlin language level starting from 1.7.</p>
+</body>
+</html>
diff --git a/plugins/kotlin/idea/resources-en/inspectionDescriptions/InlineClassDeprecatedMigration.html b/plugins/kotlin/idea/resources-en/inspectionDescriptions/InlineClassDeprecatedMigration.html
new file mode 100644
index 000000000000..a23722fe70cc
--- /dev/null
+++ b/plugins/kotlin/idea/resources-en/inspectionDescriptions/InlineClassDeprecatedMigration.html
@@ -0,0 +1,21 @@
+<html>
+<body>
+<p>
+    Reports inline classes that are deprecated and cause compilation warnings in Kotlin 1.5 and later.
+    See <a href="https://kotlinlang.org/docs/whatsnew15.html#inline-classes">What's new in Kotlin 1.5.0</a>
+</p>
+
+<p>Example:</p>
+<pre><code>
+  inline class Password(val s: String)
+</code></pre>
+
+<p>After the quick-fix is applied:</p>
+<pre><code>
+  @JvmInline
+  value class Password(val s: String)
+</code></pre>
+
+<p>Inspection is available for Kotlin language level starting from 1.5.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/resources-en/inspectionDescriptions/NoConstructorMigration.html b/plugins/kotlin/idea/resources-en/inspectionDescriptions/NoConstructorMigration.html
new file mode 100644
index 000000000000..0ca1cd0cc862
--- /dev/null
+++ b/plugins/kotlin/idea/resources-en/inspectionDescriptions/NoConstructorMigration.html
@@ -0,0 +1,25 @@
+<html>
+<body>
+Reports a constructor calls on functional supertypes that will lead to compilation error since 1.9.
+<p>Motivation types:</p>
+<ul>
+    <li>
+        The implementation does not abide by a published spec or documentation
+    </li>
+</ul>
+
+<p><b>More details:</b> <a href="https://youtrack.jetbrains.com/issue/KT-46344">KT-46344: No error for a super class constructor call on a function interface in supertypes list</a></p>
+<p>The quick-fix removes a constructor call.</p>
+<p><b>Example:</b></p>
+<pre><code>
+  abstract class A : () -> Int()
+</code></pre>
+
+<p>After the quick-fix is applied:</p>
+<pre><code>
+  abstract class A : () -> Int
+</code></pre>
+<!-- tooltip end -->
+<p>This inspection only reports if the Kotlin language level of the project or module is 1.7 or higher.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/resources-en/inspectionDescriptions/OverrideDeprecatedMigration.html b/plugins/kotlin/idea/resources-en/inspectionDescriptions/OverrideDeprecatedMigration.html
new file mode 100644
index 000000000000..6a87c40649c8
--- /dev/null
+++ b/plugins/kotlin/idea/resources-en/inspectionDescriptions/OverrideDeprecatedMigration.html
@@ -0,0 +1,42 @@
+<html>
+<body>
+Reports a declarations that are propagated by <code>@Deprecated</code> annotation that will lead to compilation error since 1.9.
+<p>Motivation types:</p>
+<ul>
+    <li>
+        Implementation changes are required for implementation design/architectural reasons
+    </li>
+    <li>
+        Inconsistency in the design (things are done differently in different contexts)
+    </li>
+</ul>
+
+<p><b>More details:</b> <a href="https://youtrack.jetbrains.com/issue/KT-47902">KT-47902: Do not propagate method deprecation through overrides</a></p>
+<p>The quick-fix copies <code>@Deprecated</code> annotation from the parent declaration.</p>
+<p><b>Example:</b></p>
+<pre><code>
+  open class <b>Base</b> {
+      @Deprecated("Don't use")
+      open fun foo() {}
+  }
+
+  class <b>Derived</b> : <b>Base</b>() {
+      override fun foo() {}
+  }
+</code></pre>
+<p>After the quick-fix is applied:</p>
+<pre><code>
+  open class <b>Base</b> {
+      @Deprecated("Don't use")
+      open fun foo() {}
+  }
+
+  class <b>Derived</b> : <b>Base</b>() {
+      @Deprecated("Don't use")
+      override fun foo() {}
+  }
+</code></pre>
+<!-- tooltip end -->
+<p>This inspection only reports if the Kotlin language level of the project or module is 1.6 or higher.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt
index bc5a4811cf31..f32800eac41f 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
 import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinIdeFileIconProviderService.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinIdeFileIconProviderService.kt
index e6eed868b117..cf9b61482147 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinIdeFileIconProviderService.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinIdeFileIconProviderService.kt
@@ -11,6 +11,8 @@ import javax.swing.Icon
 class KotlinIdeFileIconProviderService : KotlinIconProviderService() {
     override fun getFileIcon(): Icon = KotlinIcons.FILE
 
+    override fun getBuiltInFileIcon(): Icon = KotlinIcons.FILE
+
     override fun getLightVariableIcon(element: PsiModifierListOwner, flags: Int): Icon {
         val iconManager = IconManager.getInstance()
         val elementFlags = ElementPresentationUtil.getFlags(element, false)
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinJpsClasspathProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinJpsClasspathProvider.kt
index 88eb49ebb26e..bde2d7de2515 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinJpsClasspathProvider.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/KotlinJpsClasspathProvider.kt
@@ -1,30 +1,11 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.kotlin.idea
 
-import com.intellij.DynamicBundle
 import com.intellij.compiler.server.BuildProcessParametersProvider
-import com.intellij.openapi.application.PathManager.getJarPathForClass
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
 
 class KotlinJpsClasspathProvider : BuildProcessParametersProvider() {
-    override fun getClassPath(): List<String?> {
-        return listOf(
-            // kotlin-reflect.jar
-            getJarPathForClass(kotlin.reflect.full.IllegalCallableAccessException::class.java),
-
-            // kotlin-plugin.jar (aka kotlin-compiler-for-ide.jar)
-            // TODO: note it has to be compiler-components-for-jps.jar rather than kotlin-compiler-for-ide.jar
-            //  as kotlin-compiler-for-ide.jar includes kotlin-jps-common.jar as well (+maybe smth else)
-            // kotlin-compiler-common-for-ide.jar
-            getJarPathForClass(org.jetbrains.kotlin.idea.KotlinFileType::class.java),
-
-            // kotlin-compiler-fe10-for-ide.jar
-            getJarPathForClass(org.jetbrains.kotlin.descriptors.ClassDescriptor::class.java),
-
-            // kotlin-compiler-ir-for-ide.jar
-            getJarPathForClass(org.jetbrains.kotlin.ir.IrElement::class.java),
-
-            // Base of i18n
-            getJarPathForClass(DynamicBundle::class.java),
-        )
+    override fun getClassPath(): List<String> {
+        return listOf(KotlinPluginLayout.instance.jpsPluginJar.canonicalPath)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
index 25a3c5c5c836..c6279fd1ecb3 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
@@ -20,8 +20,10 @@ import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.idea.KotlinPluginCompatibilityVerifier.checkCompatibility
 import org.jetbrains.kotlin.idea.configuration.notifications.checkExternalKotlinCompilerVersion
 import org.jetbrains.kotlin.idea.configuration.notifications.notifyKotlinStyleUpdateIfNeeded
+import org.jetbrains.kotlin.idea.configuration.notifications.showEapSurveyNotification
 import org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter.Companion.setupReportingFromRelease
 import org.jetbrains.kotlin.idea.search.containsKotlinFile
+import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
@@ -78,6 +80,10 @@ internal class PluginStartupActivity : StartupActivity.Background {
 
                 if (!ApplicationManager.getApplication().isHeadlessEnvironment) {
                     notifyKotlinStyleUpdateIfNeeded(project)
+
+                    if (!isUnitTestMode()) {
+                        showEapSurveyNotification(project)
+                    }
                 }
 
                 val daemonCodeAnalyzer = DaemonCodeAnalyzerImpl.getInstanceEx(project) as DaemonCodeAnalyzerImpl
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/caches/FileAttributeServiceImpl.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/caches/FileAttributeServiceImpl.kt
index e9d54950e29f..def49798763d 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/caches/FileAttributeServiceImpl.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/caches/FileAttributeServiceImpl.kt
@@ -6,6 +6,8 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileWithId
 import com.intellij.openapi.vfs.newvfs.FileAttribute
 import com.intellij.util.io.DataInputOutputUtil
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.CachedAttributeData
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService
 import java.io.DataInput
 import java.io.DataOutput
 import java.util.concurrent.ConcurrentHashMap
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
index ac3934214afc..98a828a58215 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt
@@ -28,15 +28,15 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.renderer.render
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.ImportedFromObjectCallableDescriptor
-import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.isReallySuccess
+import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.typeUtil.unCapture
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -282,8 +282,8 @@ class CodeToInlineBuilder(
     }
 
     private fun processReferences(codeToInline: MutableCodeToInline, analyze: (KtExpression) -> BindingContext, reformat: Boolean) {
-        val targetDispatchReceiverType = targetCallable.dispatchReceiverParameter?.value?.type
-        val targetExtensionReceiverType = targetCallable.extensionReceiverParameter?.value?.type
+        val targetDispatchReceiverType = targetCallable.dispatchReceiverParameter?.value?.type?.unCapture()
+        val targetExtensionReceiverType = targetCallable.extensionReceiverParameter?.value?.type?.unCapture()
         val isAnonymousFunction = originalDeclaration?.isAnonymousFunction == true
         val isAnonymousFunctionWithReceiver = isAnonymousFunction &&
                 originalDeclaration.cast<KtNamedFunction>().receiverTypeReference != null
@@ -357,8 +357,11 @@ class CodeToInlineBuilder(
                     if (receiver is ImplicitReceiver) {
                         val resolutionScope = expression.getResolutionScope(bindingContext, resolutionFacade)
                         val receiverExpressionToInline = receiver.asExpression(resolutionScope, psiFactory)
-                        if (receiverExpressionToInline != null) {
-                            val receiverType = receiver.type.unCapture()
+                        val receiverType = receiver.type.unCapture()
+                        val isSameReceiverType = receiverType == targetDispatchReceiverType || receiverType == targetExtensionReceiverType
+                        val receiverIsUnnecessary =
+                            (receiverExpressionToInline as? KtThisExpression)?.labelQualifier != null && isSameReceiverType
+                        if (receiverExpressionToInline != null && !receiverIsUnnecessary) {
                             codeToInline.addPreCommitAction(expressionToResolve) { expr ->
                                 val expressionToReplace = expr.parent as? KtCallExpression ?: expr
                                 val replaced = codeToInline.replaceExpression(
@@ -372,7 +375,7 @@ class CodeToInlineBuilder(
                                 val thisExpression = replaced?.receiverExpression ?: return@addPreCommitAction
                                 if (isAnonymousFunctionWithReceiver && receiverType == targetExtensionReceiverType) {
                                     thisExpression.putCopyableUserData(CodeToInline.PARAMETER_USAGE_KEY, getFirstParameterName())
-                                } else if (receiverType != targetDispatchReceiverType && receiverType != targetExtensionReceiverType) {
+                                } else if (!isSameReceiverType) {
                                     thisExpression.putCopyableUserData(CodeToInline.SIDE_RECEIVER_USAGE_KEY, Unit)
                                 }
                             }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
index 5262d6183436..b40bce1d3869 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInliner/introduceValue.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoBefore
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 
 /**
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index 6a2214892f35..5ff1213692e1 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -59,7 +59,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.findFunction
 import org.jetbrains.kotlin.resolve.scopes.utils.findVariable
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.awt.datatransfer.Transferable
 import java.awt.datatransfer.UnsupportedFlavorException
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index 410eea2c2a76..7a45d13a72ba 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -28,10 +28,7 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
-import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants;
+import org.jetbrains.kotlin.cli.common.arguments.*;
 import org.jetbrains.kotlin.config.*;
 import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.PluginStartupApplicationService;
@@ -165,10 +162,10 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Di
     @SuppressWarnings("unused")
     public KotlinCompilerConfigurableTab(Project project) {
         this(project,
-             (CommonCompilerArguments) KotlinCommonCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
-             (K2JSCompilerArguments) Kotlin2JsCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
-             (K2JVMCompilerArguments) Kotlin2JvmCompilerArgumentsHolder.Companion.getInstance(project).getSettings().unfrozen(),
-             (CompilerSettings) KotlinCompilerSettings.Companion.getInstance(project).getSettings().unfrozen(),
+             FreezableKt.unfrozen(KotlinCommonCompilerArgumentsHolder.Companion.getInstance(project).getSettings()),
+             FreezableKt.unfrozen(Kotlin2JsCompilerArgumentsHolder.Companion.getInstance(project).getSettings()),
+             FreezableKt.unfrozen(Kotlin2JvmCompilerArgumentsHolder.Companion.getInstance(project).getSettings()),
+             FreezableKt.unfrozen(KotlinCompilerSettings.Companion.getInstance(project).getSettings()),
              KotlinCompilerWorkspaceSettings.getInstance(project),
              true,
              false);
@@ -390,7 +387,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Di
         apiVersionComboBox.setRenderer(new DescriptionListCellRenderer());
     }
 
-    public void setTargetPlatform(@Nullable IdePlatformKind<?> targetPlatform) {
+    public void setTargetPlatform(@Nullable IdePlatformKind targetPlatform) {
         k2jsPanel.setVisible(JsIdePlatformUtil.isJavaScript(targetPlatform));
         scriptPanel.setVisible(JvmIdePlatformUtil.isJvm(targetPlatform));
     }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt
index 813aa14edd35..31c9ebf2e550 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMigrationProjectService.kt
@@ -219,8 +219,8 @@ data class MigrationInfo(
     }
 }
 
-fun MigrationInfo.isLanguageVersionUpdate(old: LanguageVersion, new: LanguageVersion): Boolean {
-    return oldLanguageVersion <= old && newLanguageVersion >= new
+fun MigrationInfo.isLanguageVersionUpdate(untilOldVersion: LanguageVersion, sinceNewVersion: LanguageVersion): Boolean {
+    return oldLanguageVersion <= untilOldVersion && newLanguageVersion >= sinceNewVersion
 }
 
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/notifications/eapSurveyNotification.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/notifications/eapSurveyNotification.kt
new file mode 100644
index 000000000000..7b9b534b924a
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/configuration/notifications/eapSurveyNotification.kt
@@ -0,0 +1,45 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.configuration.notifications
+
+import com.intellij.ide.util.RunOnceUtil
+import com.intellij.notification.BrowseNotificationAction
+import com.intellij.notification.NotificationGroupManager
+import com.intellij.notification.NotificationType
+import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.KotlinIcons
+import org.jetbrains.kotlin.idea.compiler.configuration.KotlinPluginLayout
+import java.time.LocalDate
+import java.util.*
+
+internal fun showEapSurveyNotification(project: Project) {
+    if (LocalDate.now() > LocalDate.of(/* year = */ 2022, /* month = */ 5, /* dayOfMonth = */ 8)) return
+
+    val compilerVersion = KotlinPluginLayout.instance.ideCompilerVersion.lowercase(Locale.getDefault())
+    if (!compilerVersion.contains("1.7.0-beta")) return
+
+    // Only beta 1. Yes, it is a bit ugly, but we don't have nice IdeKotlinVersion in old kt branches. And yes, I hope we won't have beta3.
+    if (compilerVersion.contains("1.7.0-beta2")) return
+
+    RunOnceUtil.runOnceForApp("kotlin.eap.survey.was.shown.once") {
+        @Suppress("DialogTitleCapitalization")
+        val action = NotificationGroupManager.getInstance()
+            .getNotificationGroup("Kotlin EAP Survey")
+            .createNotification(
+                KotlinBundle.message("kotlin.eap.survey.notification.title"),
+                KotlinBundle.message("kotlin.eap.survey.notification.text"),
+                NotificationType.INFORMATION,
+            )
+            .addAction(
+                BrowseNotificationAction(
+                    KotlinBundle.message("kotlin.eap.survey.notification.action"),
+                    KotlinBundle.message("kotlin.eap.survey.notification.link"),
+                )
+            )
+
+        action.setSuggestionType(true)
+        action.setIcon(KotlinIcons.SMALL_LOGO)
+        action.setImportant(true)
+        action.notify(project)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
index 983971446ce0..5020acbd04de 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
@@ -11,10 +11,7 @@ import com.intellij.ui.HoverHyperlinkLabel
 import com.intellij.util.ui.FormBuilder
 import com.intellij.util.ui.ThreeStateCheckBox
 import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.config.CompilerSettings
-import org.jetbrains.kotlin.config.createArguments
-import org.jetbrains.kotlin.config.isHmpp
-import org.jetbrains.kotlin.config.splitArgumentString
+import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.compiler.configuration.*
 import org.jetbrains.kotlin.idea.core.util.onTextChange
@@ -119,9 +116,9 @@ class KotlinFacetEditorGeneralTab(
             } else {
                 editableCommonArguments = configuration!!.settings.compilerArguments!!
                 editableJvmArguments = editableCommonArguments as? K2JVMCompilerArguments
-                    ?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments
+                    ?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen()
                 editableJsArguments = editableCommonArguments as? K2JSCompilerArguments
-                    ?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments
+                    ?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen()
                 editableCompilerSettings = configuration.settings.compilerSettings!!
             }
 
@@ -201,13 +198,10 @@ class KotlinFacetEditorGeneralTab(
             compilerConfigurable.setTargetPlatform(getChosenPlatform()?.idePlatformKind)
             compilerConfigurable.setEnabled(!useProjectSettings)
             if (useProjectSettings) {
-                compilerConfigurable.commonCompilerArguments =
-                    KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as CommonCompilerArguments?
-                compilerConfigurable.k2jvmCompilerArguments =
-                    Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments?
-                compilerConfigurable.k2jsCompilerArguments =
-                    Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments?
-                compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen() as CompilerSettings?
+                compilerConfigurable.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen()
+                compilerConfigurable.k2jvmCompilerArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen()
+                compilerConfigurable.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen()
+                compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen()
             } else {
                 compilerConfigurable.commonCompilerArguments = editableCommonArguments
                 compilerConfigurable.k2jvmCompilerArguments = editableJvmArguments
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderByModuleDependencies.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderByModuleDependencies.kt
index 9c01845b208b..16c12773aaf5 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderByModuleDependencies.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinVersionInfoProviderByModuleDependencies.kt
@@ -15,7 +15,7 @@ class KotlinVersionInfoProviderByModuleDependencies : KotlinVersionInfoProvider
 
     override fun getLibraryVersions(
         module: Module,
-        platformKind: IdePlatformKind<*>,
+        platformKind: IdePlatformKind,
         rootModel: ModuleRootModel?
     ): Collection<String> {
         if (module.isDisposed) {
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
index 688cb46979bd..55f551714d75 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
@@ -104,7 +104,7 @@ fun KotlinFacetSettings.initializeIfNeeded(
     }
 }
 
-val mavenLibraryIdToPlatform: Map<String, IdePlatformKind<*>> by lazy {
+val mavenLibraryIdToPlatform: Map<String, IdePlatformKind> by lazy {
     IdePlatformKind.ALL_KINDS
         .flatMap { platform -> platform.tooling.mavenLibraryIds.map { it to platform } }
         .sortedByDescending { it.first.length }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportImpl.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportImpl.kt
index 8bbe51caf6ff..67be98e4b3ce 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportImpl.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesSupportImpl.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.Processor
 import org.jetbrains.kotlin.idea.search.usagesSearch.dataClassComponentFunction
 import org.jetbrains.kotlin.idea.search.usagesSearch.isCallReceiverRefersToCompanionObject
-import org.jetbrains.kotlin.idea.search.usagesSearch.isConstructorUsage
+import org.jetbrains.kotlin.idea.search.usagesSearch.isKotlinConstructorUsage
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -37,12 +37,12 @@ class KotlinFindUsagesSupportImpl : KotlinFindUsagesSupport {
     override fun tryRenderDeclarationCompactStyle(declaration: KtDeclaration): String? =
         org.jetbrains.kotlin.idea.search.usagesSearch.tryRenderDeclarationCompactStyle(declaration)
 
-    override fun isConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean =
-        psiReference.isConstructorUsage(ktClassOrObject)
+    override fun isKotlinConstructorUsage(psiReference: PsiReference, ktClassOrObject: KtClassOrObject): Boolean =
+        psiReference.isKotlinConstructorUsage(ktClassOrObject)
 
     override fun getSuperMethods(declaration: KtDeclaration, ignore: Collection<PsiElement>?): List<PsiElement> =
         org.jetbrains.kotlin.idea.refactoring.getSuperMethods(declaration, ignore)
 
     override fun sourcesAndLibraries(delegate: GlobalSearchScope, project: Project): GlobalSearchScope =
         org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope.sourcesAndLibraries(delegate, project)
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/goto/gotoContributors.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/goto/gotoContributors.kt
index 0b2e1310e93a..e43f55de8201 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/goto/gotoContributors.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/goto/gotoContributors.kt
@@ -8,9 +8,9 @@ import com.intellij.navigation.NavigationItem
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.StubIndex
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.stubindex.*
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClass
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowVisitor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowVisitor.kt
index 5b29fce92054..77ffeb758288 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowVisitor.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRainbowVisitor.kt
@@ -10,7 +10,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors.*
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator
+import org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator
 import org.jetbrains.kotlin.idea.util.isAnonymousFunction
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.kotlin.psi.*
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.psiUtil.parents
 
 class KotlinRainbowVisitor : RainbowVisitor() {
     companion object {
-        val KOTLIN_TARGET_ELEMENT_EVALUATOR = KotlinTargetElementEvaluator()
+        val KOTLIN_TARGET_ELEMENT_EVALUATOR = FE10KotlinTargetElementEvaluator()
     }
 
     override fun suitableForFile(file: PsiFile) = file is KtFile
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
index faa5b7c60fd2..350dfdda91c5 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinRecursiveCallLineMarkerProvider.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.highlighter.markers.LineMarkerInfos
 import org.jetbrains.kotlin.idea.inspections.RecursivePropertyAccessorInspection
 import org.jetbrains.kotlin.idea.util.getReceiverTargetDescriptor
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtToken
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
index d18cdba7760e..0eb37a3823d7 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuspendCallLineMarkerProvider.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.highlighter.markers.LineMarkerInfos
 import org.jetbrains.kotlin.idea.refactoring.getLineNumber
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingContext.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index bac5a47fedd4..c9c4a4d0a3fa 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.formatter.kotlinCustomSettings
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.references.*
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.*
-import org.jetbrains.kotlin.types.error.ErrorSimpleFunctionDescriptorImpl
+import org.jetbrains.kotlin.types.error.ErrorFunctionDescriptor
 
 class KotlinImportOptimizer : ImportOptimizer {
     override fun supports(file: PsiFile) = file is KtFile
@@ -310,5 +310,5 @@ private fun hasResolvedDescriptor(element: KtElement, bindingContext: BindingCon
         element.getResolvedCall(bindingContext) != null
     else
         element.mainReference?.resolveToDescriptors(bindingContext)?.let { descriptors ->
-            descriptors.isNotEmpty() && descriptors.none { it is ErrorSimpleFunctionDescriptorImpl }
+            descriptors.isNotEmpty() && descriptors.none { it is ErrorFunctionDescriptor }
         } == true
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt
index 27c51396015c..553b1ebc47b3 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/JavaCollectionsStaticMethodInspection.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/LeakingThisInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/LeakingThisInspection.kt
index 7161322678be..ffb864443d6c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/LeakingThisInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/LeakingThisInspection.kt
@@ -12,8 +12,8 @@ import org.jetbrains.annotations.Nls
 import org.jetbrains.kotlin.cfg.LeakingThisDescriptor.*
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeWithContentNonSourceRootCode
 import org.jetbrains.kotlin.idea.quickfix.AddModifierFixFE10
-import org.jetbrains.kotlin.idea.util.safeAnalyzeWithContentNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/NestedLambdaShadowedImplicitParameterInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/NestedLambdaShadowedImplicitParameterInspection.kt
index 3c87aba12adb..b2672713f588 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/NestedLambdaShadowedImplicitParameterInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/NestedLambdaShadowedImplicitParameterInspection.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.idea.inspections.collections.isCalling
 import org.jetbrains.kotlin.idea.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.refactoring.rename.KotlinVariableInplaceRenameHandler
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantRequireNotNullCallInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantRequireNotNullCallInspection.kt
index b71323cd1f42..4c8dfe9ae96c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantRequireNotNullCallInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RedundantRequireNotNullCallInspection.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.inspections.collections.isCalling
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtReferenceExpression
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt
index feda48ca2f8b..b28f28520f9d 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.intentions.isReferenceToBuiltInEnumFunction
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.references.resolveToDescriptors
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.idea.util.hasNotReceiver
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceArrayOfWithLiteralInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceArrayOfWithLiteralInspection.kt
index 657e5eb9419b..15b010bc1243 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceArrayOfWithLiteralInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceArrayOfWithLiteralInspection.kt
@@ -8,20 +8,13 @@ import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElementVisitor
-import org.jetbrains.kotlin.config.LanguageFeature.ArrayLiteralsInAnnotations
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.intentions.isArrayOfMethod
-import org.jetbrains.kotlin.idea.project.languageVersionSettings
-import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 
 class ReplaceArrayOfWithLiteralInspection : AbstractKotlinInspection() {
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = callExpressionVisitor(fun(expression) {
-        if (!expression.languageVersionSettings.supportsFeature(ArrayLiteralsInAnnotations) &&
-            !isUnitTestMode()
-        ) return
-
         val calleeExpression = expression.calleeExpression as? KtNameReferenceExpression ?: return
 
         when (val parent = expression.parent) {
@@ -74,4 +67,4 @@ class ReplaceArrayOfWithLiteralInspection : AbstractKotlinInspection() {
             callExpression.replace(arrayLiteral)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
index b0c4966d8032..dc20fcee2e45 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceAssertBooleanWithAssertEqualityInspection.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceWithEnumMapInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceWithEnumMapInspection.kt
index 7b76b2dee233..2286b183691a 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceWithEnumMapInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceWithEnumMapInspection.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.platform.jvm.isJvm
 import org.jetbrains.kotlin.psi.KtCallExpression
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnnecessaryOptInAnnotationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnnecessaryOptInAnnotationInspection.kt
index 8ca03bda8664..732e1890ea23 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnnecessaryOptInAnnotationInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnnecessaryOptInAnnotationInspection.kt
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.renderer.render
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.SINCE_KOTLIN_FQ_NAME
 import org.jetbrains.kotlin.resolve.checkers.OptInNames
+import org.jetbrains.kotlin.resolve.checkers.OptInNames.OPT_IN_FQ_NAMES
 import org.jetbrains.kotlin.resolve.constants.ArrayValue
 import org.jetbrains.kotlin.resolve.constants.KClassValue
 import org.jetbrains.kotlin.resolve.constants.StringValue
@@ -75,7 +76,7 @@ class UnnecessaryOptInAnnotationInspection : AbstractKotlinInspection() {
     )
 
     // Short names for `kotlin.OptIn` and `kotlin.UseExperimental` for faster comparison without name resolution
-    private val USE_EXPERIMENTAL_SHORT_NAMES = OptInNames.USE_EXPERIMENTAL_FQ_NAMES.map { it.shortName().asString() }.toSet()
+    private val OPT_IN_SHORT_NAMES = OPT_IN_FQ_NAMES.map { it.shortName().asString() }.toSet()
 
     /**
      * Main inspection visitor to traverse all annotation entries.
@@ -84,7 +85,7 @@ class UnnecessaryOptInAnnotationInspection : AbstractKotlinInspection() {
         val optInAliases = holder.file.safeAs<KtFile>()
             ?.aliasImportMap()
             ?.entries()
-            ?.filter { it.value in USE_EXPERIMENTAL_SHORT_NAMES }
+            ?.filter { it.value in OPT_IN_SHORT_NAMES }
             ?.mapNotNull { it.key }
             ?.toSet()
             ?: emptySet()
@@ -92,7 +93,7 @@ class UnnecessaryOptInAnnotationInspection : AbstractKotlinInspection() {
         return annotationEntryVisitor { annotationEntry  ->
             // Fast check if the annotation may be `@OptIn`/`@UseExperimental` or any of their import aliases
             val entryShortName = annotationEntry.shortName?.asString()
-            if (entryShortName != null && entryShortName !in USE_EXPERIMENTAL_SHORT_NAMES && entryShortName !in optInAliases)
+            if (entryShortName != null && entryShortName !in OPT_IN_SHORT_NAMES && entryShortName !in optInAliases)
                 return@annotationEntryVisitor
 
             // Resolve the candidate annotation entry. If it is an `@OptIn`/`@UseExperimental` annotation,
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnsafeCastFromDynamicInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnsafeCastFromDynamicInspection.kt
index b0c1edbb5d2d..d49763e3a832 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnsafeCastFromDynamicInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnsafeCastFromDynamicInspection.kt
@@ -6,7 +6,7 @@ import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedLambdaExpressionBodyInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedLambdaExpressionBodyInspection.kt
index ec960c3f7e9e..f865025d75a8 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedLambdaExpressionBodyInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedLambdaExpressionBodyInspection.kt
@@ -12,7 +12,7 @@ import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.builtins.isFunctionType
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
 import org.jetbrains.kotlin.resolve.BindingContext
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt
index 0066ef4c1591..873604e8a182 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedUnaryOperatorInspection.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.KotlinBundle
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 import org.jetbrains.kotlin.psi.KtExpression
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt
index 16a293ba11e2..365a11df6f97 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/UseExpressionBodyInspection.kt
@@ -15,12 +15,12 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.core.canOmitDeclaredType
 import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.core.setType
 import org.jetbrains.kotlin.idea.core.util.isOneLiner
 import org.jetbrains.kotlin.idea.intentions.hasResultingIfWithoutElse
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.CommentSaver
 import org.jetbrains.kotlin.idea.util.resultingWhens
 import org.jetbrains.kotlin.lexer.KtTokens
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/collections/ConvertCallChainIntoSequenceInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/collections/ConvertCallChainIntoSequenceInspection.kt
index 04768b2b9d5c..411ef992c0d6 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/collections/ConvertCallChainIntoSequenceInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/collections/ConvertCallChainIntoSequenceInspection.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.util.CommentSaver
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/dfa/KtDfaHelpers.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/dfa/KtDfaHelpers.kt
index 61e5dc046db7..0293f01ac02e 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/dfa/KtDfaHelpers.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/dfa/KtDfaHelpers.kt
@@ -23,8 +23,8 @@ import org.jetbrains.kotlin.builtins.StandardNames.FqNames
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.project.builtIns
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.psi.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt
index 6a8481066f19..1c7ec4bf5c98 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/jdk2k/ReplaceJavaStaticMethodWithKotlinAnalogInspection.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
 import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
 import org.jetbrains.kotlin.idea.inspections.collections.isCalling
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.textRangeIn
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtCallExpression
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AbstractDiagnosticBasedMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AbstractDiagnosticBasedMigrationInspection.kt
index e9677fb452c4..5a778dd406d2 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AbstractDiagnosticBasedMigrationInspection.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AbstractDiagnosticBasedMigrationInspection.kt
@@ -8,6 +8,7 @@ import com.intellij.codeInspection.IntentionWrapper
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.openapi.util.TextRange
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import org.jetbrains.annotations.Nls
 import org.jetbrains.kotlin.diagnostics.Diagnostic
@@ -16,12 +17,11 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithAllCompilerChecks
 import org.jetbrains.kotlin.idea.inspections.AbstractKotlinInspection
 import org.jetbrains.kotlin.idea.quickfix.QuickFixes
-import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
 
 
-abstract class AbstractDiagnosticBasedMigrationInspection<T : KtElement>(val elementType: Class<T>) : AbstractKotlinInspection() {
+abstract class AbstractDiagnosticBasedMigrationInspection<T : PsiElement>(val elementType: Class<T>) : AbstractKotlinInspection() {
     abstract val diagnosticFactory: DiagnosticFactoryWithPsiElement<T, *>
     open fun customIntentionFactory(): ((Diagnostic) -> IntentionAction?)? = null
     open fun customHighlightRangeIn(element: T): TextRange? = null
@@ -44,8 +44,8 @@ abstract class AbstractDiagnosticBasedMigrationInspection<T : KtElement>(val ele
         val actionFactory = getActionFactory()
         file.accept(
             object : KtTreeVisitorVoid() {
-                override fun visitKtElement(element: KtElement) {
-                    super.visitKtElement(element)
+                override fun visitElement(element: PsiElement) {
+                    super.visitElement(element)
 
                     if (!elementType.isInstance(element) || element.textLength == 0) return
                     val diagnostic = diagnostics.forElement(element)
@@ -65,7 +65,7 @@ abstract class AbstractDiagnosticBasedMigrationInspection<T : KtElement>(val ele
                             ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
                             false,
                             IntentionWrapper(intentionAction),
-                        ),
+                        )
                     )
                 }
             },
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AddConversionCallMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AddConversionCallMigrationInspection.kt
new file mode 100644
index 000000000000..6ae6146ded11
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AddConversionCallMigrationInspection.kt
@@ -0,0 +1,28 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.inspections.migration
+
+import com.intellij.codeInspection.CleanupLocalInspectionTool
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.diagnostics.DiagnosticFactoryWithPsiElement
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.configuration.MigrationInfo
+import org.jetbrains.kotlin.idea.configuration.isLanguageVersionUpdate
+import org.jetbrains.kotlin.idea.quickfix.migration.MigrationFix
+import org.jetbrains.kotlin.psi.KtExpression
+
+
+class AddConversionCallMigrationInspection :
+    AbstractDiagnosticBasedMigrationInspection<KtExpression>(KtExpression::class.java),
+    MigrationFix,
+    CleanupLocalInspectionTool {
+    override fun isApplicable(migrationInfo: MigrationInfo): Boolean {
+        return migrationInfo.isLanguageVersionUpdate(LanguageVersion.KOTLIN_1_6, LanguageVersion.KOTLIN_1_7)
+    }
+
+    override fun descriptionMessage(): String = KotlinBundle.message("inspection.add.conversion.call.display.name")
+
+    override val diagnosticFactory: DiagnosticFactoryWithPsiElement<KtExpression, *>
+        get() = Errors.INTEGER_OPERATOR_RESOLVE_WILL_CHANGE
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AmbiguousExpressionInWhenBranchMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AmbiguousExpressionInWhenBranchMigrationInspection.kt
new file mode 100644
index 000000000000..1fd4ee4933b2
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/AmbiguousExpressionInWhenBranchMigrationInspection.kt
@@ -0,0 +1,29 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.inspections.migration
+
+import com.intellij.codeInspection.CleanupLocalInspectionTool
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.diagnostics.DiagnosticFactoryWithPsiElement
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.configuration.MigrationInfo
+import org.jetbrains.kotlin.idea.configuration.isLanguageVersionUpdate
+import org.jetbrains.kotlin.idea.quickfix.migration.MigrationFix
+
+
+class AmbiguousExpressionInWhenBranchMigrationInspection :
+    AbstractDiagnosticBasedMigrationInspection<PsiElement>(PsiElement::class.java),
+    MigrationFix,
+    CleanupLocalInspectionTool {
+
+    override fun isApplicable(migrationInfo: MigrationInfo): Boolean {
+        return migrationInfo.isLanguageVersionUpdate(LanguageVersion.KOTLIN_1_6, LanguageVersion.KOTLIN_1_7)
+    }
+
+    override fun descriptionMessage(): String = KotlinBundle.message("inspection.ambiguous.expression.when.branch.migration.display.name")
+
+    override val diagnosticFactory: DiagnosticFactoryWithPsiElement<PsiElement, *>
+        get() = Errors.CONFUSING_BRANCH_CONDITION.warningFactory
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/InlineClassDeprecatedMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/InlineClassDeprecatedMigrationInspection.kt
new file mode 100644
index 000000000000..030797caff1d
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/InlineClassDeprecatedMigrationInspection.kt
@@ -0,0 +1,28 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+
+package org.jetbrains.kotlin.idea.inspections.migration
+
+import com.intellij.codeInspection.CleanupLocalInspectionTool
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.diagnostics.DiagnosticFactoryWithPsiElement
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.configuration.MigrationInfo
+import org.jetbrains.kotlin.idea.configuration.isLanguageVersionUpdate
+import org.jetbrains.kotlin.idea.quickfix.migration.MigrationFix
+
+
+class InlineClassDeprecatedMigrationInspection :
+    AbstractDiagnosticBasedMigrationInspection<PsiElement>(PsiElement::class.java),
+    MigrationFix,
+    CleanupLocalInspectionTool {
+    override fun isApplicable(migrationInfo: MigrationInfo): Boolean {
+        return migrationInfo.isLanguageVersionUpdate(LanguageVersion.KOTLIN_1_4, LanguageVersion.KOTLIN_1_5)
+    }
+
+    override fun descriptionMessage(): String = KotlinBundle.message("inspection.deprecated.inline.class.text")
+
+    override val diagnosticFactory: DiagnosticFactoryWithPsiElement<PsiElement, *>
+        get() = Errors.INLINE_CLASS_DEPRECATED
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/NoConstructorMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/NoConstructorMigrationInspection.kt
new file mode 100644
index 000000000000..79d8389d36a2
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/NoConstructorMigrationInspection.kt
@@ -0,0 +1,21 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.inspections.migration
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.configuration.MigrationInfo
+import org.jetbrains.kotlin.idea.configuration.isLanguageVersionUpdate
+import org.jetbrains.kotlin.idea.quickfix.migration.MigrationFix
+
+class NoConstructorMigrationInspection :
+    AbstractDiagnosticBasedMigrationInspection<PsiElement>(PsiElement::class.java),
+    MigrationFix {
+    override fun isApplicable(migrationInfo: MigrationInfo): Boolean = migrationInfo.isLanguageVersionUpdate(
+        untilOldVersion = LanguageVersion.KOTLIN_1_8,
+        sinceNewVersion = LanguageVersion.KOTLIN_1_7,
+    )
+
+    override val diagnosticFactory: DiagnosticFactory0<PsiElement> get() = Errors.NO_CONSTRUCTOR_WARNING
+}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/OverrideDeprecatedMigrationInspection.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/OverrideDeprecatedMigrationInspection.kt
new file mode 100644
index 000000000000..56ec3a204d37
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/migration/OverrideDeprecatedMigrationInspection.kt
@@ -0,0 +1,21 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.inspections.migration
+
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.diagnostics.DiagnosticFactoryWithPsiElement
+import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.idea.configuration.MigrationInfo
+import org.jetbrains.kotlin.idea.configuration.isLanguageVersionUpdate
+import org.jetbrains.kotlin.idea.quickfix.migration.MigrationFix
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+
+class OverrideDeprecatedMigrationInspection :
+    AbstractDiagnosticBasedMigrationInspection<KtNamedDeclaration>(KtNamedDeclaration::class.java),
+    MigrationFix {
+    override fun isApplicable(migrationInfo: MigrationInfo): Boolean = migrationInfo.isLanguageVersionUpdate(
+        untilOldVersion = LanguageVersion.KOTLIN_1_8,
+        sinceNewVersion = LanguageVersion.KOTLIN_1_7,
+    )
+
+    override val diagnosticFactory: DiagnosticFactoryWithPsiElement<KtNamedDeclaration, *> get() = Errors.OVERRIDE_DEPRECATION
+}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
index 55ed23205399..43d800f23334 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.inference.CapturedType
 import org.jetbrains.kotlin.resolve.calls.tower.NewResolvedCallImpl
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.checker.NewCapturedType
 
 class InsertExplicitTypeArgumentsIntention : SelfTargetingRangeIntention<KtCallExpression>(
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/LambdaToAnonymousFunctionIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/LambdaToAnonymousFunctionIntention.kt
index e5d59d05cc01..733cdb26656d 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/LambdaToAnonymousFunctionIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/LambdaToAnonymousFunctionIntention.kt
@@ -28,9 +28,9 @@ import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescript
 import org.jetbrains.kotlin.resolve.calls.util.getParameterForArgument
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorType
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeConstructor
+import org.jetbrains.kotlin.types.error.ErrorType
 import org.jetbrains.kotlin.types.isFlexible
 import org.jetbrains.kotlin.types.typeUtil.isTypeParameter
 import org.jetbrains.kotlin.types.typeUtil.isUnit
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
index 8dba90de0614..2637e8dc6da2 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForReceiver
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 
 @Suppress("DEPRECATION")
 class RemoveExplicitSuperQualifierInspection : IntentionBasedInspection<KtSuperExpression>(
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
index 0e761455be84..9dd67f421e75 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.core.copied
 import org.jetbrains.kotlin.idea.core.replaced
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
 import org.jetbrains.kotlin.idea.intentions.loopToCallChain.isTrueConstant
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.lexer.KtTokens.*
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index 2c9f759ae2cd..2e20c9e9f5a1 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -32,6 +32,8 @@ import org.jetbrains.kotlin.resolve.checkers.ExplicitApiDeclarationChecker
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorTypeKind
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 import org.jetbrains.kotlin.utils.ifEmpty
 
@@ -114,10 +116,10 @@ class SpecifyTypeExplicitlyIntention : SelfTargetingRangeIntention<KtCallableDec
             }
 
             if (type != null && type.isError && descriptor is PropertyDescriptor) {
-                return descriptor.setterType ?: ErrorUtils.createErrorType("null type")
+                return descriptor.setterType ?: ErrorUtils.createErrorType(ErrorTypeKind.NOT_FOUND_DESCRIPTOR_FOR_FUNCTION, declaration.text)
             }
 
-            return type ?: ErrorUtils.createErrorType("null type")
+            return type ?: ErrorUtils.createErrorType(ErrorTypeKind.NOT_FOUND_DESCRIPTOR_FOR_FUNCTION, declaration.text)
         }
 
         fun createTypeExpressionForTemplate(
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
index d5955e9b0269..e562007c6284 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.util.application.runWriteActionIfPhysical
 import org.jetbrains.kotlin.idea.util.application.withPsiAttachment
 import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.shouldNotConvertToProperty
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqNameUnsafe
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
index b1dfe4102f4c..5265fd9d76c7 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.KotlinTypeFactory
 import org.jetbrains.kotlin.types.isFlexible
+import org.jetbrains.kotlin.types.toDefaultAttributes
 import org.jetbrains.kotlin.types.typeUtil.builtIns
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.util.OperatorChecks
@@ -348,7 +349,7 @@ fun KotlinType.reflectToRegularFunctionType(): KotlinType {
     val parameterCount = if (isTypeAnnotatedWithExtensionFunctionType) arguments.size - 2 else arguments.size - 1
     val classDescriptor =
         if (isKSuspendFunctionType) builtIns.getSuspendFunction(parameterCount) else builtIns.getFunction(parameterCount)
-    return KotlinTypeFactory.simpleNotNullType(annotations, classDescriptor, arguments)
+    return KotlinTypeFactory.simpleNotNullType(annotations.toDefaultAttributes(), classDescriptor, arguments)
 }
 
 private val KOTLIN_BUILTIN_ENUM_FUNCTIONS = listOf(FqName("kotlin.enumValues"), FqName("kotlin.enumValueOf"))
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
index 54dabc67f9ff..6beeeb766126 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.util.application.invokeLater
 import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
 import org.jetbrains.kotlin.idea.util.application.withPsiAttachment
 import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.textRangeIn
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.lexer.KtTokens
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/HintsTypeRenderer.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/HintsTypeRenderer.kt
index 54dbac5acaa9..5f322ab21b73 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/HintsTypeRenderer.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/HintsTypeRenderer.kt
@@ -22,6 +22,9 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isCompanionObject
 import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.*
+import org.jetbrains.kotlin.types.typeUtil.isUnresolvedType
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import java.util.ArrayList
 
@@ -107,13 +110,13 @@ class HintsTypeRenderer private constructor(override val options: HintsDescripto
     }
 
     private fun SimpleType.renderSimpleTypeTo(list: MutableList<InlayInfoDetail>) {
-        if (this == TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE || TypeUtils.isDontCarePlaceholder(this)) {
+        if (this == TypeUtils.CANNOT_INFER_FUNCTION_PARAM_TYPE || TypeUtils.isDontCarePlaceholder(this)) {
             list.append("???")
             return
         }
-        if (ErrorUtils.isUninferredParameter(this)) {
+        if (ErrorUtils.isUninferredTypeVariable(this)) {
             if (options.uninferredTypeParameterAsName) {
-                list.append(renderError((this.constructor as ErrorUtils.UninferredParameterTypeConstructor).typeParameterDescriptor.name.toString()))
+                list.append(renderError((this.constructor as ErrorTypeConstructor).getParam(0)))
             } else {
                 list.append("???")
             }
@@ -143,11 +146,11 @@ class HintsTypeRenderer private constructor(override val options: HintsDescripto
         renderAnnotationsTo(list)
 
         if (this.isError) {
-            if (this is UnresolvedType && options.presentableUnresolvedTypes) {
-                list.append(this.presentableName)
+            if (isUnresolvedType(this) && options.presentableUnresolvedTypes) {
+                list.append(this.debugMessage)
             } else {
                 if (this is ErrorType && !options.informativeErrorType) {
-                    list.append(this.presentableName)
+                    list.append(this.debugMessage)
                 } else {
                     list.append(this.constructor.toString()) // Debug name of an error type is more informative
                 }
@@ -162,7 +165,7 @@ class HintsTypeRenderer private constructor(override val options: HintsDescripto
         }
 
         if (this.isDefinitelyNotNullType) {
-            list.append("!!")
+            list.append("& Any")
         }
     }
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinIdeDescriptorRenderer.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinIdeDescriptorRenderer.kt
index a36236396da2..baf9fac50119 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinIdeDescriptorRenderer.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinIdeDescriptorRenderer.kt
@@ -23,8 +23,10 @@ import org.jetbrains.kotlin.resolve.constants.KClassValue
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
 import org.jetbrains.kotlin.resolve.descriptorUtil.declaresOrInheritsDefaultValue
 import org.jetbrains.kotlin.types.*
-import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor
-import org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_FUNCTION_PARAM_TYPE
+import org.jetbrains.kotlin.types.error.*
+import org.jetbrains.kotlin.types.TypeUtils.CANNOT_INFER_FUNCTION_PARAM_TYPE
+import org.jetbrains.kotlin.types.error.ErrorUtils
+import org.jetbrains.kotlin.types.typeUtil.isUnresolvedType
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
 import java.util.*
 
@@ -236,13 +238,13 @@ open class KotlinIdeDescriptorRenderer(
     }
 
     private fun StringBuilder.appendSimpleType(type: SimpleType) {
-        if (type == CANT_INFER_FUNCTION_PARAM_TYPE || TypeUtils.isDontCarePlaceholder(type)) {
+        if (type == CANNOT_INFER_FUNCTION_PARAM_TYPE || TypeUtils.isDontCarePlaceholder(type)) {
             appendHighlighted("???") { asError }
             return
         }
-        if (ErrorUtils.isUninferredParameter(type)) {
+        if (ErrorUtils.isUninferredTypeVariable(type)) {
             if (uninferredTypeParameterAsName) {
-                append(renderError((type.constructor as UninferredParameterTypeConstructor).typeParameterDescriptor.name.toString()))
+                append(renderError((type.constructor as ErrorTypeConstructor).getParam(0)))
             } else {
                 appendHighlighted("???") { asError }
             }
@@ -334,11 +336,11 @@ open class KotlinIdeDescriptorRenderer(
         appendAnnotations(type)
 
         if (type.isError) {
-            if (type is UnresolvedType && presentableUnresolvedTypes) {
-                appendHighlighted(type.presentableName) { asError }
+            if (isUnresolvedType(type) && presentableUnresolvedTypes) {
+                appendHighlighted(type.debugMessage) { asError }
             } else {
                 if (type is ErrorType && !informativeErrorType) {
-                    appendHighlighted(type.presentableName) { asError }
+                    appendHighlighted(type.debugMessage) { asError }
                 } else {
                     appendHighlighted(type.constructor.toString()) { asError } // Debug name of an error type is more informative
                 }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/platform/IdePlatformKindTooling.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/platform/IdePlatformKindTooling.kt
index 662ade5be00c..4eb9061c2d8c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/platform/IdePlatformKindTooling.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/platform/IdePlatformKindTooling.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import javax.swing.Icon
 
 abstract class IdePlatformKindTooling {
-    abstract val kind: IdePlatformKind<*>
+    abstract val kind: IdePlatformKind
 
     abstract fun compilerArgumentsForProject(project: Project): CommonCompilerArguments?
 
@@ -61,7 +61,7 @@ abstract class IdePlatformKindTooling {
             ALL_TOOLING_SUPPORT.flatMap { tooling -> tooling.gradlePlatformIds.map { it to tooling } }.toMap()
         }
 
-        fun getTooling(kind: IdePlatformKind<*>): IdePlatformKindTooling {
+        fun getTooling(kind: IdePlatformKind): IdePlatformKindTooling {
             return TOOLING_SUPPORT_BY_KIND[kind] ?: error("Unknown platform $kind")
         }
 
@@ -78,5 +78,5 @@ abstract class IdePlatformKindTooling {
     }
 }
 
-val IdePlatformKind<*>.tooling: IdePlatformKindTooling
+val IdePlatformKind.tooling: IdePlatformKindTooling
     get() = IdePlatformKindTooling.getTooling(this)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConversionCallFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConversionCallFix.kt
new file mode 100644
index 000000000000..344d4498e63f
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConversionCallFix.kt
@@ -0,0 +1,49 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+
+package org.jetbrains.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
+import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.resolve.calls.util.getParameterForArgument
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+class AddConversionCallFix(element: KtExpression, val targetType: String) : KotlinQuickFixAction<KtExpression>(element) {
+
+    companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
+        override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
+            val expression = psiElement.safeAs<KtExpression>() ?: return emptyList()
+            val targetType = calculateTargetType(expression) ?: return emptyList()
+            return listOf(AddConversionCallFix(expression, targetType))
+        }
+
+        private fun calculateTargetType(expression: KtExpression): String? {
+            val valueArgument = expression.getParentOfType<KtValueArgument>(false) ?: return null
+            val callExpression = valueArgument.getParentOfType<KtCallExpression>(false) ?: return null
+            val resolvedCall = callExpression.resolveToCall() ?: return null
+            val parameterDescriptor = resolvedCall.getParameterForArgument(valueArgument) ?: return null
+            val type = parameterDescriptor.type
+            return IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_NO_ANNOTATIONS.renderType(type)
+        }
+    }
+
+    override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean = element != null
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        val expression = element ?: return
+        val convertExpression = KtPsiFactory(file).createExpressionByPattern("($0).to$1()", expression, targetType)
+        expression.replace(convertExpression)
+    }
+
+    override fun getText(): String {
+        return KotlinBundle.message("convert.expression.to.0", targetType)
+    }
+
+    override fun getFamilyName(): String = text
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
index 379068cbc700..7e719b75c28c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeCallableReturnTypeFix.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.isUnit
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
index a3cf10017517..39b51ab40390 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.makeNullable
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt
index f073fd455db1..5c13aa603d86 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityOnExposureFactory.kt
@@ -1,11 +1,10 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.quickfix
 
 import com.intellij.codeInsight.intention.IntentionAction
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities.*
-import org.jetbrains.kotlin.descriptors.EffectiveVisibility.Permissiveness.LESS
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory3
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
@@ -14,19 +13,18 @@ import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.isPrivate
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
-import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
-import java.util.*
 
 object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() {
 
     private fun addFixToTargetVisibility(
-            modifierListOwner: KtModifierListOwner,
-            descriptor: DeclarationDescriptorWithVisibility,
-            targetVisibility: DescriptorVisibility,
-            boundVisibility: DescriptorVisibility,
-            protectedAllowed: Boolean,
-            fixes: MutableList<IntentionAction>
+        modifierListOwner: KtModifierListOwner,
+        descriptor: DeclarationDescriptorWithVisibility,
+        targetVisibility: DescriptorVisibility,
+        boundVisibility: DescriptorVisibility,
+        protectedAllowed: Boolean,
+        fixes: MutableList<IntentionAction>,
     ) {
         val possibleVisibilities = when (targetVisibility) {
             PROTECTED -> if (protectedAllowed) listOf(boundVisibility, PROTECTED) else listOf(boundVisibility)
@@ -34,6 +32,7 @@ object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() {
             boundVisibility -> listOf(boundVisibility)
             else -> listOf()
         }
+
         possibleVisibilities.mapNotNullTo(fixes) { ChangeVisibilityFix.create(modifierListOwner, descriptor, it) }
     }
 
@@ -42,33 +41,51 @@ object ChangeVisibilityOnExposureFactory : KotlinIntentionActionsFactory() {
         val factory = diagnostic.factory as DiagnosticFactory3<*, EffectiveVisibility, DescriptorWithRelation, EffectiveVisibility>
         // We have USER that uses some EXPOSED object. USER visibility must be same or less permissive.
         val exposedDiagnostic = factory.cast(diagnostic)
-        val exposedDescriptor = exposedDiagnostic.b.descriptor as? DeclarationDescriptorWithVisibility ?: return emptyList()
-        val exposedDeclaration =
-            DescriptorToSourceUtils.getSourceFromDescriptor(exposedDescriptor) as? KtModifierListOwner ?: return emptyList()
-        val exposedVisibility = exposedDiagnostic.c
-        val userVisibility = exposedDiagnostic.a
-        val (targetUserVisibility, targetExposedVisibility) = when (exposedVisibility.relation(userVisibility, SimpleClassicTypeSystemContext)) {
-            LESS -> Pair(exposedVisibility.toDescriptorVisibility(), userVisibility.toDescriptorVisibility())
-            else -> Pair(PRIVATE, PUBLIC)
-        }
+        val exposedDescriptor = exposedDiagnostic.b.descriptor as? DeclarationDescriptorWithVisibility
+            ?: return emptyList()
+
+        val exposedDeclaration = DescriptorToSourceUtils.getSourceFromDescriptor(exposedDescriptor) as? KtModifierListOwner
+            ?: return emptyList()
+
+        val exposedVisibility = exposedDiagnostic.c.toDescriptorVisibility()
+        val userVisibility = exposedDiagnostic.a.toDescriptorVisibility()
+        val (targetUserVisibility, targetExposedVisibility) =
+            if (exposedVisibility.compareTo(userVisibility)?.let { it < 0 } == true)
+                Pair(exposedVisibility, userVisibility)
+            else
+                Pair(PRIVATE, PUBLIC)
+
         val result = ArrayList<IntentionAction>()
         val userDeclaration = diagnostic.psiElement.getParentOfType<KtDeclaration>(true)
         val protectedAllowed = exposedDeclaration.parent == userDeclaration?.parent
-        if (userDeclaration != null) {
+        if (userDeclaration != null && !userDeclaration.isPrivate()) {
             val userDescriptor = userDeclaration.toDescriptor() as? DeclarationDescriptorWithVisibility
-            if (userDescriptor != null && DescriptorVisibilityUtils.isVisibleIgnoringReceiver(exposedDescriptor, userDescriptor, exposedDeclaration.getResolutionFacade().getLanguageVersionSettings())) {
+            if (userDescriptor != null && DescriptorVisibilityUtils.isVisibleIgnoringReceiver(
+                    exposedDescriptor,
+                    userDescriptor,
+                    exposedDeclaration.getResolutionFacade().getLanguageVersionSettings(),
+                )
+            ) {
                 addFixToTargetVisibility(
-                    userDeclaration, userDescriptor,
-                    targetUserVisibility, PRIVATE,
-                    protectedAllowed, result
+                    modifierListOwner = userDeclaration,
+                    descriptor = userDescriptor,
+                    targetVisibility = targetUserVisibility,
+                    boundVisibility = PRIVATE,
+                    protectedAllowed = protectedAllowed,
+                    fixes = result,
                 )
             }
         }
+
         addFixToTargetVisibility(
-            exposedDeclaration, exposedDescriptor,
-            targetExposedVisibility, PUBLIC,
-            protectedAllowed, result
+            modifierListOwner = exposedDeclaration,
+            descriptor = exposedDescriptor,
+            targetVisibility = targetExposedVisibility,
+            boundVisibility = PUBLIC,
+            protectedAllowed = protectedAllowed,
+            fixes = result,
         )
+
         return result
     }
 }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConfusingExpressionInWhenBranchFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConfusingExpressionInWhenBranchFix.kt
new file mode 100644
index 000000000000..d84798885e4f
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConfusingExpressionInWhenBranchFix.kt
@@ -0,0 +1,38 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.quickfix
+
+import com.intellij.codeInsight.intention.IntentionAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.psi.KtExpression
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.createExpressionByPattern
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
+
+class ConfusingExpressionInWhenBranchFix(element: KtExpression) : KotlinPsiOnlyQuickFixAction<KtExpression>(element) {
+
+    companion object : QuickFixesPsiBasedFactory<PsiElement>(PsiElement::class, PsiElementSuitabilityCheckers.ALWAYS_SUITABLE) {
+        override fun doCreateQuickFix(psiElement: PsiElement): List<IntentionAction> {
+            val expression = psiElement.safeAs<KtExpression>() ?: return emptyList()
+            return listOf(ConfusingExpressionInWhenBranchFix(expression))
+        }
+    }
+
+    override fun isAvailable(project: Project, editor: Editor?, file: KtFile): Boolean = element != null
+
+    override fun invoke(project: Project, editor: Editor?, file: KtFile) {
+        val expression = element ?: return
+        val wrapped = KtPsiFactory(file).createExpressionByPattern("($0)", expression)
+        expression.replace(wrapped)
+    }
+
+    override fun getText(): String {
+        return KotlinBundle.message("wrap.expression.in.parentheses")
+    }
+
+    override fun getFamilyName(): String = text
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConverKClassToClassFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConverKClassToClassFix.kt
index c331b03140a6..47ac0c1c0687 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConverKClassToClassFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ConverKClassToClassFix.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.KotlinTypeFactory
+import org.jetbrains.kotlin.types.TypeAttributes
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 
@@ -38,7 +39,7 @@ class ConvertKClassToClassFix(element: KtExpression) : KotlinQuickFixAction<KtEx
             val javaLangClassDescriptor = file.resolveImportReference(JAVA_LANG_CLASS_FQ_NAME)
                 .singleOrNull() as? ClassDescriptor ?: return null
             val javaLangClassType = KotlinTypeFactory.simpleNotNullType(
-                Annotations.EMPTY,
+                TypeAttributes.Empty,
                 javaLangClassDescriptor,
                 listOf(TypeProjectionImpl(expressionTypeArgument))
             )
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
index 2217bc4ed91d..4b24fbb8319b 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportFix.kt
@@ -4,10 +4,18 @@ package org.jetbrains.kotlin.idea.quickfix
 
 import com.intellij.codeInsight.daemon.impl.ShowAutoImportPass
 import com.intellij.openapi.editor.Editor
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.Diagnostic
+import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 
 internal class ImportFix(expression: KtSimpleNameExpression) : AbstractImportFix(expression, MyFactory) {
+
+    override fun elementsToCheckDiagnostics(): Collection<PsiElement> {
+        val expression = element ?: return emptyList()
+        return listOfNotNull(expression, expression.parent?.takeIf { it is KtCallExpression })
+    }
+
     override fun fixSilently(editor: Editor): Boolean {
         if (isOutdated()) return false
         val element = element ?: return false
@@ -22,7 +30,14 @@ internal class ImportFix(expression: KtSimpleNameExpression) : AbstractImportFix
     }
 
     companion object MyFactory : Factory() {
-        override fun createImportAction(diagnostic: Diagnostic) =
-            (diagnostic.psiElement as? KtSimpleNameExpression)?.let(::ImportFix)
+        override fun createImportAction(diagnostic: Diagnostic): ImportFix? {
+            val simpleNameExpression = when (val element = diagnostic.psiElement) {
+                is KtSimpleNameExpression -> element
+                is KtCallExpression -> element.calleeExpression
+                else -> null
+            } as? KtSimpleNameExpression ?: return null
+
+            return ImportFix(simpleNameExpression)
+        }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeUpperBoundNonNullableFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeUpperBoundNonNullableFix.kt
index 7c8cea7d4304..fbfd0a6f69cd 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeUpperBoundNonNullableFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeUpperBoundNonNullableFix.kt
@@ -6,12 +6,13 @@ import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInspection.util.IntentionName
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.NlsContext
-import com.intellij.openapi.util.NlsSafe
-import org.jetbrains.annotations.Nls
+import com.intellij.util.containers.addIfNotNull
 import org.jetbrains.kotlin.backend.jvm.ir.psiElement
 import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import org.jetbrains.kotlin.descriptors.isOverridable
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.idea.KotlinBundle
@@ -20,7 +21,9 @@ import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getTypeParameters
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
-import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtPsiFactory
+import org.jetbrains.kotlin.psi.KtTypeParameter
 import org.jetbrains.kotlin.renderer.render
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
@@ -111,7 +114,12 @@ open class MakeUpperBoundNonNullableFix(
             return when (diagnostic.factory) {
                 ErrorsJvm.NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER -> {
                     val info = ErrorsJvm.NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER.cast(diagnostic)
-                    createActionsForType(info.a)
+                    listOfNotNull(createActionForTypeParameter(info.a))
+                }
+
+                ErrorsJvm.WRONG_TYPE_PARAMETER_NULLABILITY_FOR_JAVA_OVERRIDE -> {
+                    val info = ErrorsJvm.WRONG_TYPE_PARAMETER_NULLABILITY_FOR_JAVA_OVERRIDE.cast(diagnostic)
+                    listOfNotNull(createActionForTypeParameter(info.a))
                 }
 
                 Errors.TYPE_MISMATCH -> {
@@ -192,6 +200,17 @@ open class MakeUpperBoundNonNullableFix(
         }
 
         private fun createActionsForType(type: KotlinType, highPriority: Boolean = false): List<IntentionAction> {
+            val result = mutableListOf<IntentionAction>()
+            for (typeParameterDescriptor in type.getTypeParameters()) {
+                result.addIfNotNull(createActionForTypeParameter(typeParameterDescriptor, highPriority))
+            }
+            return result
+        }
+
+        private fun createActionForTypeParameter(
+            typeParameterDescriptor: TypeParameterDescriptor,
+            highPriority: Boolean = false,
+        ): IntentionAction? {
             fun makeAction(typeParameter: KtTypeParameter, kind: Kind): IntentionAction {
                 return if (highPriority)
                     HighPriorityMakeUpperBoundNonNullableFix(typeParameter, kind)
@@ -199,22 +218,21 @@ open class MakeUpperBoundNonNullableFix(
                     MakeUpperBoundNonNullableFix(typeParameter, kind)
             }
 
-            val result = mutableListOf<IntentionAction>()
-            for (typeParameterDescriptor in type.getTypeParameters()) {
-                val psiElement = typeParameterDescriptor.psiElement?.safeAs<KtTypeParameter>() ?: continue
-                val existingUpperBound = psiElement.extendsBound
-                if (existingUpperBound != null) {
-                    val context = existingUpperBound.analyze(BodyResolveMode.PARTIAL)
-                    val upperBoundType = context[BindingContext.TYPE, existingUpperBound] ?: continue
-                    if (upperBoundType.isMarkedNullable) {
-                        result.add(makeAction(psiElement, Kind.ReplaceExistingUpperBound(upperBoundType.makeNotNullable())))
-                    }
-                } else {
-                    result.add(makeAction(psiElement, Kind.AddAnyAsUpperBound))
+            val psiElement = typeParameterDescriptor.psiElement?.safeAs<KtTypeParameter>() ?: return null
+            val existingUpperBound = psiElement.extendsBound
+            if (existingUpperBound != null) {
+                val context = existingUpperBound.analyze(BodyResolveMode.PARTIAL)
+                val upperBoundType = context[BindingContext.TYPE, existingUpperBound] ?: return null
+                if (upperBoundType.isMarkedNullable) {
+                    return makeAction(psiElement, Kind.ReplaceExistingUpperBound(upperBoundType.makeNotNullable()))
                 }
+            } else {
+                return makeAction(psiElement, Kind.AddAnyAsUpperBound)
             }
-            return result
+
+            return null
         }
+
     }
 }
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt
index cbcb50e9f02d..37e4c3457ae3 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.kt
@@ -20,25 +20,23 @@ import org.jetbrains.kotlin.idea.intentions.reflectToRegularFunctionType
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.util.approximateWithResolvableType
 import org.jetbrains.kotlin.idea.util.getResolutionScope
+import org.jetbrains.kotlin.idea.util.module
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunction
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.util.getParameterForArgument
 import org.jetbrains.kotlin.resolve.calls.util.getParentResolvedCall
 import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.util.getValueArgumentForExpression
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
 import org.jetbrains.kotlin.types.KotlinType
-import org.jetbrains.kotlin.types.TypeProjection
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE
 import org.jetbrains.kotlin.types.isDefinitelyNotNullType
@@ -147,7 +145,6 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
             }
         }
 
-
         actions.addAll(WrapWithCollectionLiteralCallFix.create(expectedType, expressionType, diagnosticElement))
 
         ConvertCollectionFix.getConversionTypeOrNull(expressionType, expectedType)?.let {
@@ -203,7 +200,13 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
 
         // Suggest replacing the parameter type `T` with its expected definitely non-nullable subtype `T & Any`.
         // Types that contain DNN types as arguments (like `(Mutable)Collection<T & Any>`) are currently not supported.
-        if (diagnosticElement is KtReferenceExpression && expectedType.isDefinitelyNotNullType) {
+        // The "Change parameter type" action is generated only if the `DefinitelyNonNullableTypes` language feature is enabled:
+        // if it is disabled, the `T & Any` intersection type is resolved as just `T`, so the fix would not have any effect.
+        if (
+            diagnosticElement is KtReferenceExpression &&
+            expectedType.isDefinitelyNotNullType &&
+            diagnosticElement.module?.languageVersionSettings?.supportsFeature(LanguageFeature.DefinitelyNonNullableTypes) == true
+        ) {
             val descriptor = context[BindingContext.REFERENCE_TARGET, diagnosticElement]?.safeAs<CallableDescriptor>()
             when (val declaration = QuickFixUtil.safeGetDeclaration(descriptor)) {
                 is KtParameter -> {
@@ -233,7 +236,6 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
         val expressionParent = diagnosticElement.parent
 
         // Mismatch in returned expression:
-
         val function = if (expressionParent is KtReturnExpression)
             expressionParent.getTargetFunction(context)
         else
@@ -271,9 +273,7 @@ class QuickFixFactoryForTypeMismatchError : KotlinIntentionActionsFactory() {
                 || KotlinBuiltIns.isPrimitiveArray(expectedType)
             ) {
                 actions.add(AddArrayOfTypeFix(diagnosticElement, expectedType))
-                if (diagnosticElement.languageVersionSettings.supportsFeature(LanguageFeature.ArrayLiteralsInAnnotations)) {
-                    actions.add(WrapWithArrayLiteralFix(diagnosticElement))
-                }
+                actions.add(WrapWithArrayLiteralFix(diagnosticElement))
             }
         }
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index 088876cda67f..84e3809d9812 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 
 package org.jetbrains.kotlin.idea.quickfix
 
@@ -152,7 +152,10 @@ class QuickFixRegistrar : QuickFixContributor {
         NO_EXPLICIT_RETURN_TYPE_IN_API_MODE_WARNING.registerActions(SpecifyTypeExplicitlyFix())
 
 
+        INVISIBLE_REFERENCE.registerFactory(ImportFix)
+        INVISIBLE_MEMBER.registerFactory(ImportFix)
         UNRESOLVED_REFERENCE.registerFactory(ImportFix)
+
         UNRESOLVED_REFERENCE.registerFactory(ImportConstructorReferenceFix)
         DEPRECATED_ACCESS_BY_SHORT_NAME.registerFactory(AddExplicitImportForDeprecatedVisibilityFix.Factory)
         TYPE_INFERENCE_CANDIDATE_WITH_SAM_AND_VARARG.registerFactory(AddSpreadOperatorForArrayAsVarargAfterSamFixFactory)
@@ -287,10 +290,16 @@ class QuickFixRegistrar : QuickFixContributor {
         SENSELESS_NULL_IN_WHEN.registerFactory(RemoveWhenBranchFix, RemoveWhenConditionFix)
         BREAK_OR_CONTINUE_IN_WHEN.registerFactory(AddLoopLabelFix)
         NO_ELSE_IN_WHEN.registerFactory(AddWhenElseBranchFix, AddWhenRemainingBranchesFix)
+        NO_ELSE_IN_WHEN_WARNING.registerFactory(AddWhenElseBranchFix, AddWhenRemainingBranchesFix)
         NON_EXHAUSTIVE_WHEN.registerFactory(AddWhenElseBranchFix, AddWhenRemainingBranchesFix)
         NON_EXHAUSTIVE_WHEN_ON_SEALED_CLASS.registerFactory(AddWhenElseBranchFix, AddWhenRemainingBranchesFix)
         NON_EXHAUSTIVE_WHEN_STATEMENT.registerFactory(AddWhenElseBranchFix, AddWhenRemainingBranchesFix)
 
+        INVALID_IF_AS_EXPRESSION.registerFactory(AddIfElseBranchFix)
+        INVALID_IF_AS_EXPRESSION_WARNING.registerFactory(AddIfElseBranchFix)
+
+        INTEGER_OPERATOR_RESOLVE_WILL_CHANGE.registerFactory(AddConversionCallFix)
+
         NO_TYPE_ARGUMENTS_ON_RHS.registerFactory(AddStarProjectionsFixFactory)
 
         TYPE_ARGUMENTS_REDUNDANT_IN_SUPER_QUALIFIER.registerFactory(RemovePsiElementSimpleFix.RemoveTypeArgumentsFactory)
@@ -610,6 +619,7 @@ class QuickFixRegistrar : QuickFixContributor {
 
         NO_CONSTRUCTOR.registerFactory(RemoveNoConstructorFix)
         NO_CONSTRUCTOR.registerFactory(AddDefaultConstructorFix)
+        NO_CONSTRUCTOR_WARNING.registerFactory(RemoveNoConstructorFix)
 
         ANNOTATION_USED_AS_ANNOTATION_ARGUMENT.registerFactory(RemoveAtFromAnnotationArgument)
 
@@ -717,11 +727,13 @@ class QuickFixRegistrar : QuickFixContributor {
         OVERRIDE_DEPRECATION.registerFactory(AddAnnotationWithArgumentsFix.CopyDeprecatedAnnotation)
 
         NULLABLE_TYPE_PARAMETER_AGAINST_NOT_NULL_TYPE_PARAMETER.registerFactory(MakeUpperBoundNonNullableFix)
+        WRONG_TYPE_PARAMETER_NULLABILITY_FOR_JAVA_OVERRIDE.registerFactory(MakeUpperBoundNonNullableFix)
         WRONG_NULLABILITY_FOR_JAVA_OVERRIDE.registerFactory(MakeUpperBoundNonNullableFix)
         TYPE_MISMATCH.registerFactory(MakeUpperBoundNonNullableFix)
         TYPE_MISMATCH_WARNING.registerFactory(MakeUpperBoundNonNullableFix)
         NOTHING_TO_OVERRIDE.registerFactory(MakeUpperBoundNonNullableFix)
 
         WRONG_NULLABILITY_FOR_JAVA_OVERRIDE.registerFactory(ChangeMemberFunctionSignatureFix)
+        CONFUSING_BRANCH_CONDITION.registerFactory(ConfusingExpressionInWhenBranchFix)
     }
 }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifySuperTypeFix.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifySuperTypeFix.kt
index 7e6e11517620..edeefabc4be1 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifySuperTypeFix.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifySuperTypeFix.kt
@@ -29,7 +29,7 @@ class SpecifySuperTypeFix(
     private val superTypes: List<String>
 ) : KotlinQuickFixAction<KtSuperExpression>(superExpression) {
 
-    override fun getText() = KotlinIdeaCompletionBundle.message("intention.name.specify.supertype")
+    override fun getText() = KotlinBundle.message("intention.name.specify.supertype")
 
     override fun getFamilyName() = text
 
@@ -49,14 +49,14 @@ class SpecifySuperTypeFix(
     }
 
     private fun KtSuperExpression.specifySuperType(superType: String) {
-        project.executeWriteCommand(KotlinIdeaCompletionBundle.message("intention.name.specify.supertype")) {
+        project.executeWriteCommand(KotlinBundle.message("intention.name.specify.supertype")) {
             val label = this.labelQualifier?.text ?: ""
             replace(KtPsiFactory(this).createExpression("super<$superType>$label"))
         }
     }
 
     private fun createListPopupStep(superExpression: KtSuperExpression, superTypes: List<String>): ListPopupStep<*> {
-        return object : BaseListPopupStep<String>(KotlinIdeaCompletionBundle.message("popup.title.choose.supertype"), superTypes) {
+        return object : BaseListPopupStep<String>(KotlinBundle.message("popup.title.choose.supertype"), superTypes) {
             override fun isAutoSelectionEnabled() = false
 
             override fun onChosen(selectedValue: String, finalChoice: Boolean): PopupStep<*>? {
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt
index a56401da92aa..dbf8dc528ea9 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
index 1075b875ec6c..9e2cd44e5ba5 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass
 import org.jetbrains.kotlin.resolve.scopes.HierarchicalScope
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.makeNotNullable
 import org.jetbrains.kotlin.types.typeUtil.supertypes
@@ -65,7 +66,7 @@ private fun KotlinType.renderSingle(typeParameterNameMap: Map<TypeParameterDescr
 
         val defaultType = typeParameter.defaultType
         val wrappingType = KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-            defaultType.annotations,
+            defaultType.annotations.toDefaultAttributes(),
             wrappingTypeConstructor,
             defaultType.arguments,
             defaultType.isMarkedNullable,
@@ -300,7 +301,7 @@ internal fun KotlinType.substitute(substitution: KotlinTypeSubstitution, varianc
             val (projection, typeParameter) = pair
             TypeProjectionImpl(Variance.INVARIANT, projection.type.substitute(substitution, typeParameter.variance))
         }
-        KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(annotations, constructor, newArguments, isMarkedNullable, memberScope)
+        KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(annotations.toDefaultAttributes(), constructor, newArguments, isMarkedNullable, memberScope)
     }
 }
 
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateIteratorFunctionActionFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateIteratorFunctionActionFactory.kt
index f448579592fa..696f72d3ebfd 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateIteratorFunctionActionFactory.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateIteratorFunctionActionFactory.kt
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.types.KotlinTypeFactory
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.kotlin.types.Variance
+import org.jetbrains.kotlin.types.toDefaultAttributes
 import org.jetbrains.kotlin.util.OperatorNameConventions
 import java.util.*
 
@@ -40,7 +41,7 @@ object CreateIteratorFunctionActionFactory : CreateCallableMemberFromUsageFactor
         val returnJetTypeParameterType = TypeProjectionImpl(returnJetTypeParameterTypes[0])
         val returnJetTypeArguments = Collections.singletonList(returnJetTypeParameterType)
         val newReturnJetType = KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-            returnJetType.annotations,
+            returnJetType.annotations.toDefaultAttributes(),
             returnJetType.constructor,
             returnJetTypeArguments,
             returnJetType.isMarkedNullable,
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
index c7436ab4321b..cebc2923c65b 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateSetFunctionActionFactory.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.calls.util.getType
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import org.jetbrains.kotlin.util.OperatorNameConventions
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
index a04dae8c1ca8..3efc3b08ca6f 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt
@@ -98,7 +98,7 @@ private object ForceTypeCopySubstitution : TypeSubstitution() {
 }
 
 private fun KotlinType.copyAsSimpleType(): SimpleType = KotlinTypeFactory.simpleTypeWithNonTrivialMemberScope(
-    annotations,
+    annotations.toDefaultAttributes(),
     constructor,
     arguments,
     isMarkedNullable,
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
index 7bbb5721a83f..863745df76c8 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
@@ -56,6 +56,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.typeUtil.makeNullable
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 import org.jetbrains.kotlin.utils.DFS.*
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index 0b52072c65f7..ed8523d92df3 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -51,6 +51,7 @@ import org.jetbrains.annotations.Nls
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.getAccessorLightMethods
+import org.jetbrains.kotlin.asJava.isSyntheticValuesOrValueOfMethod
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.descriptors.*
@@ -664,6 +665,8 @@ fun createJavaClass(klass: KtClass, targetClass: PsiClass?, forcePlainClass: Boo
     }
 
     for (method in template.methods) {
+        if (isSyntheticValuesOrValueOfMethod(method)) continue
+
         val hasParams = method.parameterList.parametersCount > 0
         val needSuperCall = !template.isEnum &&
                 (template.superClass?.constructors ?: PsiMethod.EMPTY_ARRAY).all {
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt
index a5e65ccc7cbf..916371b7fa26 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameConflictUtils.kt
@@ -58,7 +58,7 @@ import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.resolve.scopes.utils.getImplicitReceiversHierarchy
 import org.jetbrains.kotlin.resolve.source.getPsi
-import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.utils.SmartList
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportImpl.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportImpl.kt
index 94afe8ea7771..e8559374a53d 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportImpl.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/KotlinSearchUsagesSupportImpl.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.util.hasJavaResolutionFacade
 import org.jetbrains.kotlin.idea.core.isInheritable
 import org.jetbrains.kotlin.idea.core.isOverridable
 import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingMethod
-import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.search.usagesSearch.*
 import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
@@ -34,12 +33,6 @@ class KotlinSearchUsagesSupportImpl : KotlinSearchUsagesSupport {
     override fun isSamInterface(psiClass: PsiClass): Boolean =
         org.jetbrains.kotlin.idea.search.usagesSearch.isSamInterface(psiClass)
 
-    override fun <T : PsiNamedElement> filterDataClassComponentsIfDisabled(
-        elements: List<T>,
-        kotlinOptions: KotlinReferencesSearchOptions
-    ): List<T> =
-        elements.filterDataClassComponentsIfDisabled(kotlinOptions)
-
     override fun isCallableOverrideUsage(reference: PsiReference, declaration: KtNamedDeclaration): Boolean =
         reference.isCallableOverrideUsage(declaration)
 
@@ -117,4 +110,4 @@ class KotlinSearchUsagesSupportImpl : KotlinSearchUsagesSupport {
 
     override fun createConstructorHandle(psiMethod: PsiMethod): KotlinSearchUsagesSupport.ConstructorCallHandle =
         JavaConstructorCallLazyDescriptorHandle(psiMethod)
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FE10KotlinTargetElementEvaluator.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FE10KotlinTargetElementEvaluator.kt
new file mode 100644
index 000000000000..809cc451cc07
--- /dev/null
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/FE10KotlinTargetElementEvaluator.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+package org.jetbrains.kotlin.idea.search.ideaExtensions
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReference
+import org.jetbrains.kotlin.descriptors.CallableDescriptor
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
+import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter.Companion.isAutoCreatedItUsage
+import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors
+import org.jetbrains.kotlin.psi.KtCallableDeclaration
+import org.jetbrains.kotlin.psi.KtLambdaExpression
+import org.jetbrains.kotlin.psi.KtNameReferenceExpression
+import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
+import org.jetbrains.kotlin.resolve.source.getPsi
+
+class FE10KotlinTargetElementEvaluator : KotlinTargetElementEvaluator() {
+    companion object {
+        fun findLambdaOpenLBraceForGeneratedIt(ref: PsiReference): PsiElement? {
+            val element: PsiElement = ref.element
+            if (element.text != "it") return null
+
+            if (element !is KtNameReferenceExpression || !isAutoCreatedItUsage(element)) return null
+
+            val itDescriptor = element.resolveMainReferenceToDescriptors().singleOrNull() ?: return null
+            val descriptorWithSource = itDescriptor.containingDeclaration as? DeclarationDescriptorWithSource ?: return null
+            val lambdaExpression = descriptorWithSource.source.getPsi()?.parent as? KtLambdaExpression ?: return null
+            return lambdaExpression.leftCurlyBrace.treeNext?.psi
+        }
+    }
+
+    override fun findLambdaOpenLBraceForGeneratedIt(ref: PsiReference): PsiElement? =
+        Companion.findLambdaOpenLBraceForGeneratedIt(ref)
+
+    override fun findReceiverForThisInExtensionFunction(ref: PsiReference): PsiElement? {
+        val element: PsiElement = ref.element
+        if (element.text != "this") return null
+
+        if (element !is KtNameReferenceExpression) return null
+        val callableDescriptor = element.resolveMainReferenceToDescriptors().singleOrNull() as? CallableDescriptor ?: return null
+
+        if (!callableDescriptor.isExtension) return null
+        val callableDeclaration = callableDescriptor.source.getPsi() as? KtCallableDeclaration ?: return null
+
+        return callableDeclaration.receiverTypeReference
+    }
+
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
deleted file mode 100644
index f368899b617c..000000000000
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.search.ideaExtensions
-
-import com.intellij.codeInsight.JavaTargetElementEvaluator
-import com.intellij.codeInsight.TargetElementEvaluatorEx
-import com.intellij.codeInsight.TargetElementUtil
-import com.intellij.codeInsight.TargetElementUtilExtender
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiReference
-import com.intellij.util.BitUtil
-import org.jetbrains.kotlin.descriptors.CallableDescriptor
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
-import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter.Companion.isAutoCreatedItUsage
-import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference
-import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
-import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.*
-import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
-import org.jetbrains.kotlin.resolve.source.getPsi
-
-class KotlinTargetElementEvaluator : TargetElementEvaluatorEx, TargetElementUtilExtender {
-    companion object {
-        const val DO_NOT_UNWRAP_LABELED_EXPRESSION = 0x100
-        const val BYPASS_IMPORT_ALIAS = 0x200
-
-        // Place caret after the open curly brace in lambda for generated 'it'
-        fun findLambdaOpenLBraceForGeneratedIt(ref: PsiReference): PsiElement? {
-            val element: PsiElement = ref.element
-            if (element.text != "it") return null
-
-            if (element !is KtNameReferenceExpression || !isAutoCreatedItUsage(element)) return null
-
-            val itDescriptor = element.resolveMainReferenceToDescriptors().singleOrNull() ?: return null
-            val descriptorWithSource = itDescriptor.containingDeclaration as? DeclarationDescriptorWithSource ?: return null
-            val lambdaExpression = descriptorWithSource.source.getPsi()?.parent as? KtLambdaExpression ?: return null
-            return lambdaExpression.leftCurlyBrace.treeNext?.psi
-        }
-
-        // Navigate to receiver element for this in extension declaration
-        fun findReceiverForThisInExtensionFunction(ref: PsiReference): PsiElement? {
-            val element: PsiElement = ref.element
-            if (element.text != "this") return null
-
-            if (element !is KtNameReferenceExpression) return null
-            val callableDescriptor = element.resolveMainReferenceToDescriptors().singleOrNull() as? CallableDescriptor ?: return null
-
-            if (!callableDescriptor.isExtension) return null
-            val callableDeclaration = callableDescriptor.source.getPsi() as? KtCallableDeclaration ?: return null
-
-            return callableDeclaration.receiverTypeReference
-        }
-    }
-
-    override fun getAdditionalDefinitionSearchFlags() = 0
-
-    override fun getAdditionalReferenceSearchFlags() = DO_NOT_UNWRAP_LABELED_EXPRESSION or BYPASS_IMPORT_ALIAS
-
-    override fun getAllAdditionalFlags() = additionalDefinitionSearchFlags + additionalReferenceSearchFlags
-
-    override fun includeSelfInGotoImplementation(element: PsiElement): Boolean = !(element is KtClass && element.isAbstract())
-
-    override fun getElementByReference(ref: PsiReference, flags: Int): PsiElement? {
-        if (ref is KtSimpleNameReference && ref.expression is KtLabelReferenceExpression) {
-            val refTarget = ref.resolve() as? KtExpression ?: return null
-            if (!BitUtil.isSet(flags, DO_NOT_UNWRAP_LABELED_EXPRESSION)) {
-                return refTarget.getLabeledParent(ref.expression.getReferencedName()) ?: refTarget
-            }
-            return refTarget
-        }
-
-        if (!BitUtil.isSet(flags, BYPASS_IMPORT_ALIAS)) {
-            (ref.element as? KtSimpleNameExpression)?.mainReference?.getImportAlias()?.let { return it }
-        }
-
-        // prefer destructing declaration entry to its target if element name is accepted
-        if (ref is KtDestructuringDeclarationReference && BitUtil.isSet(flags, TargetElementUtil.ELEMENT_NAME_ACCEPTED)) {
-            return ref.element
-        }
-
-        val refExpression = ref.element as? KtSimpleNameExpression
-        val calleeExpression = refExpression?.getParentOfTypeAndBranch<KtCallElement> { calleeExpression }
-        if (calleeExpression != null) {
-            (ref.resolve() as? KtConstructor<*>)?.let {
-                return if (flags and JavaTargetElementEvaluator().additionalReferenceSearchFlags != 0) it else it.containingClassOrObject
-            }
-        }
-
-        if (BitUtil.isSet(flags, TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED)) {
-            return findLambdaOpenLBraceForGeneratedIt(ref)
-                ?: findReceiverForThisInExtensionFunction(ref)
-        }
-
-        return null
-    }
-
-    override fun isIdentifierPart(file: PsiFile, text: CharSequence, offset: Int): Boolean {
-        val elementAtCaret = file.findElementAt(offset)
-
-        if (elementAtCaret?.node?.elementType == KtTokens.IDENTIFIER) return true
-        // '(' is considered identifier part if it belongs to primary constructor without 'constructor' keyword
-        return elementAtCaret?.getNonStrictParentOfType<KtPrimaryConstructor>()?.textOffset == offset
-    }
-}
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
index 13319e85efe1..421ff73a5114 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
@@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.search.usagesSearch
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.psi.util.MethodSignatureUtil
-import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.asJava.toLightMethods
@@ -26,13 +25,11 @@ import org.jetbrains.kotlin.idea.project.findAnalyzerServices
 import org.jetbrains.kotlin.idea.references.unwrappedTargets
 import org.jetbrains.kotlin.idea.search.KotlinSearchUsagesSupport
 import org.jetbrains.kotlin.idea.search.ReceiverTypeSearcherInfo
-import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions
 import org.jetbrains.kotlin.idea.util.FuzzyType
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.fuzzyExtensionReceiverType
 import org.jetbrains.kotlin.idea.util.toFuzzyType
 import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
@@ -129,22 +126,13 @@ fun PsiReference.checkUsageVsOriginalDescriptor(
         }
 }
 
-fun PsiReference.isConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean = with(element) {
-    fun checkJavaUsage(): Boolean {
-        val call = getNonStrictParentOfType<PsiConstructorCall>()
-        return call == parent && call?.resolveConstructor()?.containingClass?.navigationElement == ktClassOrObject
-    }
-
-    fun checkKotlinUsage(): Boolean {
-        if (this !is KtElement) return false
+fun PsiReference.isKotlinConstructorUsage(ktClassOrObject: KtClassOrObject): Boolean = with(element) {
+    if (this !is KtElement) return false
 
-        val descriptor = getConstructorCallDescriptor() as? ConstructorDescriptor ?: return false
-
-        val declaration = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.containingDeclaration)
-        return declaration == ktClassOrObject || (declaration is KtConstructor<*> && declaration.getContainingClassOrObject() == ktClassOrObject)
-    }
+    val descriptor = getConstructorCallDescriptor() as? ConstructorDescriptor ?: return false
 
-    checkJavaUsage() || checkKotlinUsage()
+    val declaration = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.containingDeclaration)
+    return declaration == ktClassOrObject || (declaration is KtConstructor<*> && declaration.getContainingClassOrObject() == ktClassOrObject)
 }
 
 private fun KtElement.getConstructorCallDescriptor(): DeclarationDescriptor? {
@@ -228,26 +216,6 @@ fun PsiReference.isCallableOverrideUsage(declaration: KtNamedDeclaration): Boole
     }
 }
 
-fun <T : PsiNamedElement> List<T>.filterDataClassComponentsIfDisabled(kotlinOptions: KotlinReferencesSearchOptions): List<T> {
-    if (kotlinOptions.searchForComponentConventions) return this
-
-    fun PsiNamedElement.isComponentElement(): Boolean {
-
-        if (this !is PsiMethod) return false
-
-        val dataClassParent = ((parent as? KtLightClass)?.kotlinOrigin as? KtClass)?.isData() == true
-        if (!dataClassParent) return false
-
-        if (!Name.isValidIdentifier(name)) return false
-        val nameIdentifier = Name.identifier(name)
-        if (!DataClassDescriptorResolver.isComponentLike(nameIdentifier)) return false
-
-        return true
-    }
-
-    return filter { !it.isComponentElement() }
-}
-
 fun KtFile.forceResolveReferences(elements: List<KtElement>) {
     getResolutionFacade().analyze(elements, BodyResolveMode.PARTIAL)
 }
@@ -314,4 +282,4 @@ fun KtFile.getDefaultImports(): List<ImportPath> {
     )
 }
 
-fun PsiFile.scriptDefinitionExists(): Boolean = findScriptDefinition() != null
\ No newline at end of file
+fun PsiFile.scriptDefinitionExists(): Boolean = findScriptDefinition() != null
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
index c4e0f9fbba3f..285d3933b32b 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/slicer/InflowSlicer.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.toValVar
 import org.jetbrains.kotlin.idea.references.KtPropertyDelegationMethodsReference
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.references.readWriteAccessWithFullExpression
-import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator
+import org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
@@ -380,7 +380,7 @@ class InflowSlicer(
     private fun KtFunctionLiteral.implicitItUsages(): Collection<KtSimpleNameExpression> {
         return collectDescendantsOfType(fun(expression: KtSimpleNameExpression): Boolean {
             if (expression.getQualifiedExpressionForSelector() != null || expression.getReferencedName() != "it") return false
-            val lBrace = KotlinTargetElementEvaluator.findLambdaOpenLBraceForGeneratedIt(expression.mainReference) ?: return false
+            val lBrace = FE10KotlinTargetElementEvaluator.findLambdaOpenLBraceForGeneratedIt(expression.mainReference) ?: return false
             return lBrace == this.lBrace.node.treeNext.psi
         })
     }
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/KotlinStructuralSearchUtil.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/KotlinStructuralSearchUtil.kt
index 8d4c386fdbc2..7c1166377c24 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/KotlinStructuralSearchUtil.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/KotlinStructuralSearchUtil.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.KotlinTypeFactory
+import org.jetbrains.kotlin.types.TypeAttributes
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 
 fun getCommentText(comment: PsiComment): String {
@@ -56,4 +57,4 @@ fun KtDeclaration.resolveKotlinType(): KotlinType? =
     (resolveToDescriptorIfAny() as? CallableDescriptor)?.returnType
 
 fun ClassDescriptor.toSimpleType(nullable: Boolean = false) =
-    KotlinTypeFactory.simpleType(Annotations.EMPTY, this.typeConstructor, emptyList(), nullable)
\ No newline at end of file
+    KotlinTypeFactory.simpleType(TypeAttributes.Empty, this.typeConstructor, emptyList(), nullable)
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/visitor/KotlinMatchingVisitor.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/visitor/KotlinMatchingVisitor.kt
index 583fc5041181..913c1a29542f 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/visitor/KotlinMatchingVisitor.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/structuralsearch/visitor/KotlinMatchingVisitor.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
 import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
 import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.core.resolveType
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.intentions.calleeName
@@ -32,7 +33,6 @@ import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchReques
 import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.idea.structuralsearch.*
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl
diff --git a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
index cf5da62f4032..5bde6b76f4af 100644
--- a/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
+++ b/plugins/kotlin/idea/tests/kotlin.idea.tests.iml
@@ -67,7 +67,7 @@
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm-debugger.util" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm-debugger.evaluation" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.j2k.services" scope="TEST" />
@@ -88,7 +88,7 @@
     <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.grazie.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm-run-configurations" scope="TEST" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
index 06c639cd8016..62dd797eb432 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
@@ -5,9 +5,9 @@ package org.jetbrains.kotlin.asJava
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.impl.ResolveScopeManager
 import com.intellij.util.ThrowableRunnable
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.MockLibraryFacility
 import org.jetbrains.kotlin.idea.test.runAll
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassSanityTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassSanityTest.kt
index b3c8f3ca57c1..64c58bc98676 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassSanityTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/AbstractUltraLightClassSanityTest.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.util.OperatorNameConventions
 import java.io.File
 
 abstract class AbstractUltraLightClassSanityTest : KotlinLightCodeInsightFixtureTestCase() {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassLoadingTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassLoadingTestGenerated.java
index de638003e4af..29439f00a5bc 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassLoadingTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassLoadingTestGenerated.java
@@ -30,11 +30,6 @@ public class UltraLightClassLoadingTestGenerated extends AbstractUltraLightClass
         super.setUp();
     }
 
-    @TestMetadata("annotationTargets_1_6.kt")
-    public void testAnnotationTargets_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/annotationTargets_1_6.kt"));
-    }
-
     @TestMetadata("annotationWithSetParamPropertyModifier.kt")
     public void testAnnotationWithSetParamPropertyModifier() throws Exception {
         runTest(compilerTestData("compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.kt"));
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassSanityTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassSanityTestGenerated.java
index 986e454be562..704624c9348b 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassSanityTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/asJava/classes/UltraLightClassSanityTestGenerated.java
@@ -175,11 +175,6 @@ public class UltraLightClassSanityTestGenerated extends AbstractUltraLightClassS
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt"));
     }
 
-    @TestMetadata("SpecialAnnotationsOnAnnotationClass_1_6.kt")
-    public void testSpecialAnnotationsOnAnnotationClass_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt"));
-    }
-
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt"));
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
index 9800d67cd860..29b68609c761 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.kt
@@ -363,6 +363,9 @@ internal fun <T : PsiElement> findUsagesAndCheckResults(
 
         val usageChunks = ArrayList<TextChunk>()
         usageChunks.addAll(usageAdapter.presentation.text.asList())
+        if (usageChunks.isNotEmpty()) {
+            usageChunks[1] = TextChunk(usageChunks[1] .attributes, usageChunks[1].text.trimIndent())
+        }
         usageChunks.add(1, TextChunk(TextAttributes(), " ")) // add space after line number
 
         buildString {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
index aa5f731fdada..bbf7223b0af9 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
@@ -10,6 +10,9 @@ import java.io.File
 @RunWith(JUnit38ClassRunner::class)
 open class FindUsagesMultiModuleTest : AbstractFindUsagesMultiModuleTest() {
 
+    protected fun getTestdataFile(): File =
+        File(testDataPath + getTestName(true).removePrefix("test"))
+
     fun testFindActualInterface() {
         doTest()
     }
@@ -35,7 +38,7 @@ open class FindUsagesMultiModuleTest : AbstractFindUsagesMultiModuleTest() {
     }
 
     private fun doTest() {
-        setupMppProjectFromDirStructure(File(testDataPath + getTestName(true).removePrefix("test")))
+        setupMppProjectFromDirStructure(getTestdataFile())
         doFindUsagesTest()
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
index c0956be0eafa..3af130c1519b 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
@@ -205,6 +205,11 @@ public abstract class FormatterTestGenerated extends AbstractFormatterTest {
             runTest("testData/formatter/DanglingComments.after.kt");
         }
 
+        @TestMetadata("DefinitelyNonNullTypes.after.kt")
+        public void testDefinitelyNonNullTypes() throws Exception {
+            runTest("testData/formatter/DefinitelyNonNullTypes.after.kt");
+        }
+
         @TestMetadata("DelegationList.after.kt")
         public void testDelegationList() throws Exception {
             runTest("testData/formatter/DelegationList.after.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinJpsClasspathProviderTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinJpsClasspathProviderTest.kt
deleted file mode 100644
index 6cbcf990223d..000000000000
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/KotlinJpsClasspathProviderTest.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.idea
-
-import com.intellij.testFramework.LightPlatformTestCase
-import org.junit.internal.runners.JUnit38ClassRunner
-import org.junit.runner.RunWith
-import java.io.File
-
-@RunWith(JUnit38ClassRunner::class)
-class KotlinJpsClasspathProviderTest : LightPlatformTestCase() {
-    private val KOTLIN_REFLECT_PREFIX = "kotlin-reflect"
-    private val KOTLIN_COMPILER_COMMON_FOR_IDE_PREFIX = "kotlin-compiler-common-for-ide"
-    private val KOTLIN_COMPILER_FE10_FOR_IDE_PREFIX = "kotlin-compiler-fe10-for-ide"
-    private val KOTLIN_COMPILER_IR_FOR_IDE_PREFIX = "kotlin-compiler-ir-for-ide"
-    private val INTELLIJ_PLATFORM_CORE = "intellij.platform.core"
-
-    fun testGetClassPath() {
-        val inst = KotlinJpsClasspathProvider()
-        val jars = inst.classPath
-
-        assertEquals(5, jars.size)
-        assertJar(jars[0], KOTLIN_REFLECT_PREFIX)
-        assertJar(jars[1], KOTLIN_COMPILER_COMMON_FOR_IDE_PREFIX)
-        assertJar(jars[2], KOTLIN_COMPILER_FE10_FOR_IDE_PREFIX)
-        assertJar(jars[3], KOTLIN_COMPILER_IR_FOR_IDE_PREFIX)
-        assertJar(jars[4], INTELLIJ_PLATFORM_CORE)
-    }
-
-    private fun assertJar(jar: String?, prefix: String) {
-        val jarName = File(jar!!).name
-        assertTrue("Expected jar with prefix: $prefix, but $jarName found.",
-                   jarName.startsWith(prefix))
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
index 1f846d208e21..0ec6cf554072 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeCompiledLightClassTestGenerated.java
@@ -175,11 +175,6 @@ public class IdeCompiledLightClassTestGenerated extends AbstractIdeCompiledLight
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt"));
     }
 
-    @TestMetadata("SpecialAnnotationsOnAnnotationClass_1_6.kt")
-    public void testSpecialAnnotationsOnAnnotationClass_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt"));
-    }
-
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt"));
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
index 7beb6f5911f3..89f7ac015bfe 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeLightClassTestGenerated.java
@@ -175,11 +175,6 @@ public class IdeLightClassTestGenerated extends AbstractIdeLightClassTest {
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt"));
     }
 
-    @TestMetadata("SpecialAnnotationsOnAnnotationClass_1_6.kt")
-    public void testSpecialAnnotationsOnAnnotationClass_1_6() throws Exception {
-        runTest(compilerTestData("compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt"));
-    }
-
     @TestMetadata("StubOrderForOverloads.kt")
     public void testStubOrderForOverloads() throws Exception {
         runTest(compilerTestData("compiler/testData/asJava/lightClasses/StubOrderForOverloads.kt"));
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt
index 1ebfc541a540..8f397b3ea0df 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt
@@ -36,6 +36,9 @@ import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.js.JsPlatforms
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils.allowProjectRootAccess
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils.disposeVfsRootAccess
+import org.jetbrains.kotlin.konan.target.KonanTarget
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.platform.konan.NativePlatforms
 import org.jetbrains.kotlin.test.util.addDependency
 import org.jetbrains.kotlin.test.util.jarRoot
 import org.jetbrains.kotlin.test.util.moduleLibrary
@@ -446,6 +449,263 @@ class IdeaModuleInfoTest : JavaModuleTestCase() {
         )
     }
 
+    // KTIJ-20815
+    fun testPlatformModulesForJvm() {
+        val nativePlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+        val jvmPlatform = JvmPlatforms.jvm8
+
+        val commonMain = module("commonMain", hasTestRoot = false).also {
+            it.setUpPlatform(TargetPlatform(nativePlatform.componentPlatforms + jvmPlatform))
+        }
+        val nativeMain = module("nativeMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(nativePlatform, dependsOnModules = listOf(commonMain))
+        }
+        val intermediateJvmMain = module("intermediateJvmMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(commonMain))
+        }
+        val leafJvmMain = module("leafJvmMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(intermediateJvmMain))
+        }
+
+        val jvmInfos = getIdeaModelInfosCache(project).forPlatform(jvmPlatform)
+
+        Assert.assertEquals(
+            "Exactly one JVM platform module info should be created",
+            1, jvmInfos.filterIsInstance<PlatformModuleInfo>().size,
+        )
+        Assert.assertEquals(
+            "JVM platform module info should be created from the leaf JVM module, not shared JVM",
+            leafJvmMain.production, jvmInfos.filterIsInstance<PlatformModuleInfo>().single().platformModule,
+        )
+        Assert.assertTrue(
+            "Native module info should remain intact after JVM platform module info creation",
+            nativeMain.production in jvmInfos,
+        )
+    }
+
+    fun testPlatformModulesForNative() {
+        val nativePlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+        val jvmPlatform = JvmPlatforms.jvm8
+
+        val commonMain = module("commonMain", hasTestRoot = false).also {
+            it.setUpPlatform(TargetPlatform(nativePlatform.componentPlatforms + jvmPlatform))
+        }
+        val intermediateJvmMain = module("intermediateJvmMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(commonMain))
+        }
+        val leafJvmMain = module("leafJvmMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(intermediateJvmMain))
+        }
+        val nativeMain = module("nativeMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(nativePlatform, dependsOnModules = listOf(commonMain))
+        }
+
+        val nativeInfos = getIdeaModelInfosCache(project).forPlatform(nativePlatform)
+
+        Assert.assertEquals(
+            "Exactly one Native platform module info should be created",
+            1, nativeInfos.filterIsInstance<PlatformModuleInfo>().size,
+        )
+        Assert.assertEquals(
+            "Native platform module info should be created from the native module",
+            nativeMain.production, nativeInfos.filterIsInstance<PlatformModuleInfo>().single().platformModule,
+        )
+        Assert.assertTrue(
+            "JVM module infos should remain intact after Native platform module info creation",
+            leafJvmMain.production in nativeInfos && intermediateJvmMain.production in nativeInfos,
+        )
+    }
+
+    fun testPlatformModulesForTwoIndependentModules() {
+        val jvmPlatform = JvmPlatforms.jvm8
+        val nativePlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+
+        module("leafJvmMain", hasTestRoot = false).also{ it.setUpPlatform(jvmPlatform) }
+        module("leafNativeMain", hasTestRoot = false).also{ it.setUpPlatform(nativePlatform) }
+
+        val moduleInfos = getIdeaModelInfosCache(project)
+
+        fun assert(platform: TargetPlatform) {
+            Assert.assertTrue(
+                "Platform module infos should only be created for platform modules with shared common modules",
+                moduleInfos.forPlatform(platform).none { it is PlatformModuleInfo }
+            )
+        }
+
+        assert(jvmPlatform)
+        assert(nativePlatform)
+    }
+
+    fun testPlatformModulesForSimpleCommon() {
+        val jvmPlatform = JvmPlatforms.jvm8
+        val nativePlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+
+        val common = module("commonMain", hasTestRoot = false).also {
+            it.setUpPlatform(TargetPlatform(jvmPlatform.componentPlatforms + nativePlatform))
+        }
+        val jvmModule = module("leafJvmMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(common))
+        }
+        val nativeModule = module("leafNativeMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(nativePlatform, dependsOnModules = listOf(common))
+        }
+
+        assertPlatformModules(jvmPlatform, jvmModule)
+        assertPlatformModules(nativePlatform, nativeModule)
+    }
+
+    fun testPlatformModulesForIntermediateCommon() {
+        val jvmPlatform = JvmPlatforms.jvm8
+        val nativePlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+        val commonPlatform = TargetPlatform(jvmPlatform.componentPlatforms + nativePlatform)
+
+        val common = module("commonMain", hasTestRoot = false).also { it.setUpPlatform(commonPlatform) }
+        val intermediate = module("intermediateMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(commonPlatform, dependsOnModules = listOf(common))
+        }
+        val jvmModule = module("leafJvmMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(intermediate))
+        }
+        val nativeModule = module("leafNativeMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(nativePlatform, dependsOnModules = listOf(intermediate))
+        }
+
+        assertPlatformModules(jvmPlatform, jvmModule)
+        assertPlatformModules(nativePlatform, nativeModule)
+    }
+
+    fun testPlatformModulesForDiamond() {
+        val thePlatform = JvmPlatforms.jvm8
+
+        val common = module("commonMain", hasTestRoot = false).also { it.setUpPlatform(thePlatform) }
+        val left = module("leftMain", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(thePlatform, dependsOnModules = listOf(common))
+        }
+        val right = module("rightMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(thePlatform, dependsOnModules = listOf(common))
+        }
+        val leaf = module("leafMain", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(thePlatform, dependsOnModules = listOf(left, right))
+        }
+
+        assertPlatformModules(thePlatform, leaf)
+    }
+
+    fun testPlatformModulesForForkedTree() {
+        val jvmPlatform = JvmPlatforms.jvm8
+        val macOsPlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+        val iosPlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.IOS_X64)
+        val watchosPlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.WATCHOS_X64)
+        val sharedNativePlatform = TargetPlatform(macOsPlatform.componentPlatforms + iosPlatform + watchosPlatform)
+        val commonPlatform = TargetPlatform(sharedNativePlatform.componentPlatforms + jvmPlatform)
+
+        val common = module("common", hasTestRoot = false).also { it.setUpPlatform(commonPlatform) }
+        val sharedNative = module("sharedNative", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(sharedNativePlatform, dependsOnModules = listOf(common))
+        }
+        val watchOs = module("watchOs", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(watchosPlatform, dependsOnModules = listOf(sharedNative))
+        }
+        val ios = module("ios", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(iosPlatform, dependsOnModules = listOf(sharedNative))
+        }
+        val macOs = module("macOs", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(macOsPlatform, dependsOnModules = listOf(sharedNative))
+        }
+        val jvm = module("jvm", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(common))
+        }
+
+        assertPlatformModules(jvmPlatform, jvm)
+        assertPlatformModules(macOsPlatform, macOs)
+        assertPlatformModules(iosPlatform, ios)
+        assertPlatformModules(watchosPlatform, watchOs)
+    }
+
+    fun testPlatformModulesForBambooBranchedTree() {
+        val jvmPlatform = JvmPlatforms.jvm8
+        val macOsPlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.MACOS_X64)
+        val iosPlatform = NativePlatforms.nativePlatformBySingleTarget(KonanTarget.IOS_X64)
+        val sharedNativePlatform = TargetPlatform(macOsPlatform.componentPlatforms + iosPlatform)
+        val commonPlatform = TargetPlatform(sharedNativePlatform.componentPlatforms + jvmPlatform)
+
+        val common = module("common", hasTestRoot = false).also { it.setUpPlatform(commonPlatform) }
+        val left = module("left", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(sharedNativePlatform, dependsOnModules = listOf(common))
+        }
+        val leftLeft = module("leftLeft", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(macOsPlatform, dependsOnModules = listOf(left))
+        }
+        val leftRight = module("leftRight", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(iosPlatform, dependsOnModules = listOf(left))
+        }
+        val right = module("right", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(common))
+        }
+        val rightRight = module("farRight", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(right))
+        }
+        val macOsModule = module("macos", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(macOsPlatform, dependsOnModules = listOf(leftLeft))
+        }
+        val iosModule = module("ios", hasTestRoot = false).also {
+            it.setUpPlatformAndDependsOnModules(iosPlatform, dependsOnModules = listOf(leftRight))
+        }
+        val jvmModule = module("jvm", hasTestRoot = false).also{
+            it.setUpPlatformAndDependsOnModules(jvmPlatform, dependsOnModules = listOf(rightRight))
+        }
+
+        assertPlatformModules(jvmPlatform, jvmModule)
+        assertPlatformModules(macOsPlatform, macOsModule)
+        assertPlatformModules(iosPlatform, iosModule)
+    }
+
+    fun testPlatformModulesForTestModules() {
+        val thePlatform = JvmPlatforms.jvm8
+        val common = module("common", hasTestRoot = true).also { it.setUpPlatform(thePlatform) }
+        val intermediate = module("intermediate", hasTestRoot = true).also {
+            it.setUpPlatformAndDependsOnModules(thePlatform, dependsOnModules = listOf(common))
+        }
+        val leaf = module("leaf", hasTestRoot = true).also {
+            it.setUpPlatformAndDependsOnModules(thePlatform, dependsOnModules = listOf(intermediate))
+        }
+
+        val moduleInfosForThePlatform = getIdeaModelInfosCache(project).forPlatform(thePlatform)
+
+        Assert.assertNotNull(
+            "Expect single PlatformModuleInfo for main compilation",
+            moduleInfosForThePlatform.singleOrNull { it is PlatformModuleInfo && it.platformModule == leaf.production }
+        )
+
+        Assert.assertNotNull(
+            "Expect single PlatformModuleInfo for test compilation",
+            moduleInfosForThePlatform.singleOrNull { it is PlatformModuleInfo && it.platformModule == leaf.test }
+        )
+
+        Assert.assertEquals(
+            "Expect only two platform modules, one for main and one for test compilation",
+            2, moduleInfosForThePlatform.filterIsInstance<PlatformModuleInfo>().size
+        )
+    }
+
+    private fun assertPlatformModules(platform: TargetPlatform, leafSourceModule: Module) {
+        val moduleInfos = getIdeaModelInfosCache(project)
+        val moduleInfosForPlatform = moduleInfos.forPlatform(platform)
+        val platformModulesForPlatform = moduleInfosForPlatform.filterIsInstance<PlatformModuleInfo>()
+
+        Assert.assertNotNull(
+            "Expect the only platform module for platform $platform to be based on $leafSourceModule; found: ${platformModulesForPlatform}",
+            platformModulesForPlatform.singleOrNull()?.takeIf {
+                it.platformModule == leafSourceModule.production
+            }
+        )
+
+        Assert.assertTrue(
+            "Expect no unbound modules not covered by a PlatformModuleInfo for platform $platform",
+            moduleInfosForPlatform.none { it is ModuleSourceInfo && it.platform == platform }
+        )
+    }
+
     private fun createFileInModule(module: Module, fileName: String, inTests: Boolean = false): VirtualFile {
         val fileToCopyIO = createTempFile(fileName, "")
 
@@ -544,6 +804,17 @@ class IdeaModuleInfoTest : JavaModuleTestCase() {
         )
     }
 
+    private fun Module.setUpPlatformAndDependsOnModules(
+        targetPlatform: TargetPlatform,
+        dependsOnModules: List<Module>,
+    ) {
+        createMultiplatformFacetM3(
+            platformKind = targetPlatform,
+            dependsOnModuleNames = dependsOnModules.map { it.name },
+            pureKotlinSourceFolders = listOf(),
+        )
+    }
+
     override fun setUp() {
         super.setUp()
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinReferenceTypeHintsProviderTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinReferenceTypeHintsProviderTestGenerated.java
index 1371f2463162..6b6a1e9e8c8c 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinReferenceTypeHintsProviderTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/hints/KotlinReferenceTypeHintsProviderTestGenerated.java
@@ -53,6 +53,11 @@ public class KotlinReferenceTypeHintsProviderTestGenerated extends AbstractKotli
         runTest("testData/codeInsight/hints/types/ConstructorWithoutTypeParametersType.kt");
     }
 
+    @TestMetadata("DefinitelyNonNullTypes.kt")
+    public void testDefinitelyNonNullTypes() throws Exception {
+        runTest("testData/codeInsight/hints/types/DefinitelyNonNullTypes.kt");
+    }
+
     @TestMetadata("DestructingType.kt")
     public void testDestructingType() throws Exception {
         runTest("testData/codeInsight/hints/types/DestructingType.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
index a9049fc0f510..ebbb9f8370b9 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt
@@ -65,8 +65,8 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest()
     fun testNoKotlincExistsNoSettingsLatestRuntime() {
         val application = ApplicationManager.getApplication() as ApplicationImpl
         application.isSaveAllowed = true
-        Assert.assertEquals(VersionView.RELEASED_VERSION, module.languageVersionSettings.languageVersion)
-        Assert.assertEquals(VersionView.RELEASED_VERSION, myProject.getLanguageVersionSettings(null).languageVersion)
+        Assert.assertEquals(LanguageVersion.LATEST_STABLE, module.languageVersionSettings.languageVersion)
+        Assert.assertEquals(LanguageVersion.LATEST_STABLE, myProject.getLanguageVersionSettings(null).languageVersion)
         application.saveAll()
         checkKotlincPresence(false)
     }
@@ -74,8 +74,8 @@ open class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinInTempDirTest()
     fun testKotlincExistsNoSettingsLatestRuntimeNoVersionAutoAdvance() {
         val application = ApplicationManager.getApplication() as ApplicationImpl
         application.isSaveAllowed = true
-        Assert.assertEquals(VersionView.RELEASED_VERSION, module.languageVersionSettings.languageVersion)
-        Assert.assertEquals(VersionView.RELEASED_VERSION, myProject.getLanguageVersionSettings(null).languageVersion)
+        Assert.assertEquals(LanguageVersion.LATEST_STABLE, module.languageVersionSettings.languageVersion)
+        Assert.assertEquals(LanguageVersion.LATEST_STABLE, myProject.getLanguageVersionSettings(null).languageVersion)
         KotlinCommonCompilerArgumentsHolder.getInstance(project).update {
             autoAdvanceLanguageVersion = false
             autoAdvanceApiVersion = false
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
index e401e64ea74e..105e082a174e 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
@@ -156,7 +156,7 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest {
     public void testProjectWithFacetWithRuntime11WithLanguageLevel10() {
         assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion());
         assertEquals(
-                VersionView.Companion.getRELEASED_VERSION(),
+                LanguageVersion.LATEST_STABLE,
                 PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()
         );
     }
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt
index dfdc544217c1..7458be9da2b1 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt
@@ -4,7 +4,7 @@ package org.jetbrains.kotlin.idea.decompiler
 
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.findTestLibraryRoot
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -12,9 +12,9 @@ import org.jetbrains.kotlin.name.ClassId
 import org.junit.Assert
 
 abstract class AbstractInternalCompiledClassesTest : KotlinLightCodeInsightFixtureTestCase() {
-    private fun isFileWithHeader(predicate: (IDEKotlinBinaryClassCache.KotlinBinaryClassHeaderData, ClassId) -> Boolean): VirtualFile.() -> Boolean =
+    private fun isFileWithHeader(predicate: (ClsKotlinBinaryClassCache.KotlinBinaryClassHeaderData, ClassId) -> Boolean): VirtualFile.() -> Boolean =
         {
-            val info = IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(this)
+            val info = ClsKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(this)
             info != null && predicate(info, info.classId)
         }
 
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
index 6550c3043036..bf33113f45ae 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
@@ -6,8 +6,8 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.util.ThrowableRunnable
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.toLightClass
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.MockLibraryFacility
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt
index 4e9977b13415..d79cebcd228f 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt
@@ -10,8 +10,8 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.stubs.StubElement
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.util.indexing.FileContentImpl
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder
 import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClsStubBuilder
 import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest
 import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt
index a0d3d998e2db..458cfc3c4a4e 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt
@@ -3,21 +3,24 @@
 package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiManager
+import com.intellij.psi.stubs.StubElement
 import com.intellij.testFramework.BinaryLightVirtualFile
 import com.intellij.testFramework.LightVirtualFile
 import com.intellij.util.PathUtil
 import com.intellij.util.indexing.FileContentImpl
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinDecompiledFileViewProvider
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder
 import org.jetbrains.kotlin.codegen.ClassBuilderFactories
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeWithAllCompilerChecks
-import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClsStubBuilder
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
+import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt
index ff08396c812e..091cc8052d7c 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerConsistencyTest.kt
@@ -8,11 +8,11 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.ThrowableRunnable
 import com.intellij.util.indexing.FileContentImpl
-import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
-import org.jetbrains.kotlin.idea.decompiler.builtIns.BuiltInDefinitionFile
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler
-import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler
-import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata
+import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinMetadataStubBuilder
 import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
@@ -63,7 +63,7 @@ class BuiltInDecompilerConsistencyTest : KotlinLightCodeInsightFixtureTestCase()
         // do not compare commonized classes
         // proper fix is to get `expect` modifier from stub rather from bytecode metadata: https://youtrack.jetbrains.com/issue/KT-45534
         val expectClassNames = builtInsDecompiler.readFile(builtInsFile)?.let { metadata ->
-            return@let if (metadata is FileWithMetadata.Compatible) {
+            return@let if (metadata is KotlinMetadataStubBuilder.FileWithMetadata.Compatible) {
                  metadata.proto.class_List.filter { Flags.IS_EXPECT_CLASS.get(it.flags) }
                     .map { metadata.nameResolver.getClassId(it.fqName).shortClassName.asString() }.toSet()
             } else null
@@ -80,7 +80,7 @@ class BuiltInDecompilerConsistencyTest : KotlinLightCodeInsightFixtureTestCase()
             val classFile = dir.findChild(className + "." + JavaClassFileType.INSTANCE.defaultExtension)!!
             val fileContent = FileContentImpl.createByFile(classFile)
             val file = fileContent.file
-            if (IDEKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(file) == null) continue
+            if (ClsKotlinBinaryClassCache.getInstance().getKotlinBinaryClassHeaderData(file) == null) continue
             val fileStub = classFileDecompiler.stubBuilder.buildFileStub(fileContent) ?: continue
             val classStub = fileStub.findChildStubByType(KtClassElementType.getStubType(false)) ?: continue
             val classFqName = classStub.getFqName()!!
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
index 7fc41365da7c..fda196637d55 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
@@ -4,7 +4,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.PsiFileStub
 import com.intellij.util.indexing.FileContentImpl
-import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler
 import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java
deleted file mode 100644
index 43af6ed12e73..000000000000
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.idea.decompiler.stubBuilder;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("idea/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/decompiler/stubBuilder")
-public class ClsStubBuilderTestGenerated extends AbstractClsStubBuilderTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("AnnotatedFlexibleTypes")
-    public void testAnnotatedFlexibleTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/");
-    }
-
-    @TestMetadata("AnnotatedParameterInEnumConstructor")
-    public void testAnnotatedParameterInEnumConstructor() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotatedParameterInEnumConstructor/");
-    }
-
-    @TestMetadata("AnnotatedParameterInInnerClassConstructor")
-    public void testAnnotatedParameterInInnerClassConstructor() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotatedParameterInInnerClassConstructor/");
-    }
-
-    @TestMetadata("AnnotationClass")
-    public void testAnnotationClass() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotationClass/");
-    }
-
-    @TestMetadata("AnnotationValues")
-    public void testAnnotationValues() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotationValues/");
-    }
-
-    @TestMetadata("Annotations")
-    public void testAnnotations() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Annotations/");
-    }
-
-    @TestMetadata("AnnotationsOnNullableTypes")
-    public void testAnnotationsOnNullableTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotationsOnNullableTypes/");
-    }
-
-    @TestMetadata("AnnotationsOnParenthesizedTypes")
-    public void testAnnotationsOnParenthesizedTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnnotationsOnParenthesizedTypes/");
-    }
-
-    @TestMetadata("AnonymousReturnWithGenericType")
-    public void testAnonymousReturnWithGenericType() throws Exception {
-        runTest("testData/decompiler/stubBuilder/AnonymousReturnWithGenericType/");
-    }
-
-    @TestMetadata("ClassMembers")
-    public void testClassMembers() throws Exception {
-        runTest("testData/decompiler/stubBuilder/ClassMembers/");
-    }
-
-    @TestMetadata("ClassObject")
-    public void testClassObject() throws Exception {
-        runTest("testData/decompiler/stubBuilder/ClassObject/");
-    }
-
-    @TestMetadata("Const")
-    public void testConst() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Const/");
-    }
-
-    @TestMetadata("Contracts")
-    public void testContracts() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Contracts/");
-    }
-
-    @TestMetadata("DataClass")
-    public void testDataClass() throws Exception {
-        runTest("testData/decompiler/stubBuilder/DataClass/");
-    }
-
-    @TestMetadata("Delegation")
-    public void testDelegation() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Delegation/");
-    }
-
-    @TestMetadata("DependencyOnNestedClasses")
-    public void testDependencyOnNestedClasses() throws Exception {
-        runTest("testData/decompiler/stubBuilder/DependencyOnNestedClasses/");
-    }
-
-    @TestMetadata("Enum")
-    public void testEnum() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Enum/");
-    }
-
-    @TestMetadata("FlexibleTypes")
-    public void testFlexibleTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/FlexibleTypes/");
-    }
-
-    @TestMetadata("FunInterfaceDeclaration")
-    public void testFunInterfaceDeclaration() throws Exception {
-        runTest("testData/decompiler/stubBuilder/FunInterfaceDeclaration/");
-    }
-
-    @TestMetadata("InheritingClasses")
-    public void testInheritingClasses() throws Exception {
-        runTest("testData/decompiler/stubBuilder/InheritingClasses/");
-    }
-
-    @TestMetadata("InnerClassEnumEntry")
-    public void testInnerClassEnumEntry() throws Exception {
-        runTest("testData/decompiler/stubBuilder/InnerClassEnumEntry/");
-    }
-
-    @TestMetadata("InnerTypes")
-    public void testInnerTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/InnerTypes/");
-    }
-
-    @TestMetadata("LocalClass")
-    public void testLocalClass() throws Exception {
-        runTest("testData/decompiler/stubBuilder/LocalClass/");
-    }
-
-    @TestMetadata("Modifiers")
-    public void testModifiers() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Modifiers/");
-    }
-
-    @TestMetadata("MultifileClass")
-    public void testMultifileClass() throws Exception {
-        runTest("testData/decompiler/stubBuilder/MultifileClass/");
-    }
-
-    @TestMetadata("NamedCompanionObject")
-    public void testNamedCompanionObject() throws Exception {
-        runTest("testData/decompiler/stubBuilder/NamedCompanionObject/");
-    }
-
-    @TestMetadata("NestedClasses")
-    public void testNestedClasses() throws Exception {
-        runTest("testData/decompiler/stubBuilder/NestedClasses/");
-    }
-
-    @TestMetadata("Objects")
-    public void testObjects() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Objects/");
-    }
-
-    @TestMetadata("PrivateConstField")
-    public void testPrivateConstField() throws Exception {
-        runTest("testData/decompiler/stubBuilder/PrivateConstField/");
-    }
-
-    @TestMetadata("PrivateToThis")
-    public void testPrivateToThis() throws Exception {
-        runTest("testData/decompiler/stubBuilder/PrivateToThis/");
-    }
-
-    @TestMetadata("Sealed")
-    public void testSealed() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Sealed/");
-    }
-
-    @TestMetadata("SecondaryConstructors")
-    public void testSecondaryConstructors() throws Exception {
-        runTest("testData/decompiler/stubBuilder/SecondaryConstructors/");
-    }
-
-    @TestMetadata("SuspendLambda")
-    public void testSuspendLambda() throws Exception {
-        runTest("testData/decompiler/stubBuilder/SuspendLambda/");
-    }
-
-    @TestMetadata("TopJvmPackageName")
-    public void testTopJvmPackageName() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TopJvmPackageName/");
-    }
-
-    @TestMetadata("TopLevelMembersAnnotatedKt")
-    public void testTopLevelMembersAnnotatedKt() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TopLevelMembersAnnotatedKt/");
-    }
-
-    @TestMetadata("TopLevelMembersKt")
-    public void testTopLevelMembersKt() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TopLevelMembersKt/");
-    }
-
-    @TestMetadata("TypeAliases")
-    public void testTypeAliases() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TypeAliases/");
-    }
-
-    @TestMetadata("TypeBoundsAndDelegationSpecifiers")
-    public void testTypeBoundsAndDelegationSpecifiers() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/");
-    }
-
-    @TestMetadata("TypeModifiers")
-    public void testTypeModifiers() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TypeModifiers/");
-    }
-
-    @TestMetadata("TypeParams")
-    public void testTypeParams() throws Exception {
-        runTest("testData/decompiler/stubBuilder/TypeParams/");
-    }
-
-    @TestMetadata("Types")
-    public void testTypes() throws Exception {
-        runTest("testData/decompiler/stubBuilder/Types/");
-    }
-}
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
index 58e272875be9..b8854608443b 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt
@@ -4,8 +4,8 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.util.indexing.FileContentImpl
-import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClsStubBuilder
-import org.jetbrains.kotlin.idea.decompiler.classFile.buildDecompiledTextForClassFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.buildDecompiledTextForClassFile
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt
index 123e595a23dd..7ebbb255e4a7 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiWhiteSpace
-import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtDecompiledFile
 import org.jetbrains.kotlin.idea.test.MockLibraryFacility
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClass
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
index e077830277db..847ee50b3e52 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
@@ -11,8 +11,8 @@ import com.intellij.psi.PsiFile
 import com.intellij.util.indexing.FileContentImpl
 import com.intellij.util.io.exists
 import com.intellij.util.io.readText
-import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClsStubBuilder
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.KotlinClsStubBuilder
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.serializeToString
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
index c1c1c2d4bb21..21f6e46b84b4 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt
@@ -3,6 +3,8 @@
 package org.jetbrains.kotlin.idea.decompiler.textBuilder
 
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
+import org.jetbrains.kotlin.analysis.decompiler.psi.ResolverForDecompiler
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.buildDecompiledTextForClassFile
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -11,7 +13,6 @@ import org.jetbrains.kotlin.descriptors.MemberDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider
-import org.jetbrains.kotlin.idea.decompiler.classFile.buildDecompiledTextForClassFile
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
index 0c32029415de..0b07b719b601 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
@@ -5,9 +5,9 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.testFramework.LightProjectDescriptor
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
+import org.jetbrains.kotlin.analysis.decompiler.psi.text.INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT
 import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
-import org.jetbrains.kotlin.idea.decompiler.common.INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName
 import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR
 import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
index 4e11d4c4c21a..8753f42e0832 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
@@ -10,6 +10,7 @@ import com.intellij.testFramework.ExpectedHighlightingData;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.InTextDirectivesUtils;
+import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseKt;
 import org.jetbrains.kotlin.idea.test.TagsTestDataUtil;
 
 import java.io.File;
@@ -27,7 +28,8 @@ public abstract class AbstractHighlightingTest extends KotlinLightCodeInsightFix
         boolean checkWeakWarnings = !InTextDirectivesUtils.isDirectiveDefined(fileText, NO_CHECK_WEAK_WARNINGS_PREFIX);
         boolean checkWarnings = !InTextDirectivesUtils.isDirectiveDefined(fileText, NO_CHECK_WARNINGS_PREFIX);
 
-        myFixture.checkHighlighting(checkWarnings, checkInfos, checkWeakWarnings);
+        KotlinLightCodeInsightFixtureTestCaseKt.withCustomCompilerOptions(fileText, getProject(), getModule(), () ->
+                myFixture.checkHighlighting(checkWarnings, checkInfos, checkWeakWarnings));
     }
 
     protected void doTest(String unused) throws Exception {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
index 442a14e5d36c..b439954305e2 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java
@@ -33,6 +33,11 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest {
         runTest("testData/highlighter/AutoCreatedItParameter.kt");
     }
 
+    @TestMetadata("DefinitelyNonNullableType.kt")
+    public void testDefinitelyNonNullableType() throws Exception {
+        runTest("testData/highlighter/DefinitelyNonNullableType.kt");
+    }
+
     @TestMetadata("DelegatingCtor.kt")
     public void testDelegatingCtor() throws Exception {
         runTest("testData/highlighter/DelegatingCtor.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index 6932fb8fc7c6..20eb08074e62 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -7335,6 +7335,39 @@ public abstract class LocalInspectionTestGenerated extends AbstractLocalInspecti
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/inspectionsLocal/overrideDeprecatedMigration")
+    public static class OverrideDeprecatedMigration extends AbstractLocalInspectionTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("copyDeprecation1.kt")
+        public void testCopyDeprecation1() throws Exception {
+            runTest("testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt");
+        }
+
+        @TestMetadata("copyDeprecation2.kt")
+        public void testCopyDeprecation2() throws Exception {
+            runTest("testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt");
+        }
+
+        @TestMetadata("copyDeprecation3.kt")
+        public void testCopyDeprecation3() throws Exception {
+            runTest("testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt");
+        }
+
+        @TestMetadata("copyDeprecation4.kt")
+        public void testCopyDeprecation4() throws Exception {
+            runTest("testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt");
+        }
+
+        @TestMetadata("copyDeprecationProperty.kt")
+        public void testCopyDeprecationProperty() throws Exception {
+            runTest("testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/inspectionsLocal/prohibitJvmOverloadsOnConstructorsOfAnnotationClassesMigration")
     public static class ProhibitJvmOverloadsOnConstructorsOfAnnotationClassesMigration extends AbstractLocalInspectionTest {
         private void runTest(String testDataFilePath) throws Exception {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 82ef757e2dbc..a834724af1a1 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -3885,9 +3885,29 @@ public abstract class IntentionTestGenerated extends AbstractIntentionTest {
                 runTest("testData/intentions/changeVisibility/private/inAnnotation.kt");
             }
 
-            @TestMetadata("interface.kt")
-            public void testInterface() throws Exception {
-                runTest("testData/intentions/changeVisibility/private/interface.kt");
+            @TestMetadata("interfaceFunction.kt")
+            public void testInterfaceFunction() throws Exception {
+                runTest("testData/intentions/changeVisibility/private/interfaceFunction.kt");
+            }
+
+            @TestMetadata("interfaceFunctionWithBody.kt")
+            public void testInterfaceFunctionWithBody() throws Exception {
+                runTest("testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt");
+            }
+
+            @TestMetadata("interfaceFunctionWithExpressionBody.kt")
+            public void testInterfaceFunctionWithExpressionBody() throws Exception {
+                runTest("testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt");
+            }
+
+            @TestMetadata("interfaceProperty.kt")
+            public void testInterfaceProperty() throws Exception {
+                runTest("testData/intentions/changeVisibility/private/interfaceProperty.kt");
+            }
+
+            @TestMetadata("interfacePropertyWithGetter.kt")
+            public void testInterfacePropertyWithGetter() throws Exception {
+                runTest("testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt");
             }
 
             @TestMetadata("jvmField.kt")
@@ -4083,6 +4103,11 @@ public abstract class IntentionTestGenerated extends AbstractIntentionTest {
                 runTest("testData/intentions/changeVisibility/protected/notForFinalClass5.kt");
             }
 
+            @TestMetadata("notForInterfaceMember.kt")
+            public void testNotForInterfaceMember() throws Exception {
+                runTest("testData/intentions/changeVisibility/protected/notForInterfaceMember.kt");
+            }
+
             @TestMetadata("notForNonValParameter.kt")
             public void testNotForNonValParameter() throws Exception {
                 runTest("testData/intentions/changeVisibility/protected/notForNonValParameter.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
index ed0e8594a7ce..4e091e0bc681 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
@@ -6,10 +6,10 @@ import com.intellij.psi.PsiClass;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration;
 import org.jetbrains.kotlin.asJava.classes.KtLightClass;
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration;
 import org.jetbrains.kotlin.config.JvmDefaultMode;
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/notification/notificationUtils.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/notification/notificationUtils.kt
new file mode 100644
index 000000000000..f1388f552e2c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/notification/notificationUtils.kt
@@ -0,0 +1,30 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.notification
+
+import com.intellij.notification.Notification
+import com.intellij.notification.Notifications
+import com.intellij.openapi.application.impl.NonBlockingReadActionImpl
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
+import junit.framework.TestCase.assertNull
+
+fun catchNotificationText(project: Project, action: () -> Unit): String? {
+  val myDisposable = Disposer.newDisposable()
+  try {
+    var notificationText: String? = null
+    val connection = project.messageBus.connect(myDisposable)
+    connection.subscribe(Notifications.TOPIC, object : Notifications {
+      override fun notify(notification: Notification) {
+        assertNull(notificationText)
+        notificationText = notification.content
+      }
+    })
+
+    action()
+    connection.deliverImmediately()
+    NonBlockingReadActionImpl.waitForAsyncTaskCompletion()
+    return notificationText
+  } finally {
+    Disposer.dispose(myDisposable)
+  }
+}
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
index b77058e47337..949d9fe5fbe8 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java
@@ -722,6 +722,34 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/quickfix/autoImports/invisible")
+        public static class Invisible extends AbstractQuickFixMultiFileTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithExtraFile, this, testDataFilePath);
+            }
+
+            @TestMetadata("annotation.before.Main.kt")
+            public void testAnnotation() throws Exception {
+                runTest("testData/quickfix/autoImports/invisible/annotation.before.Main.kt");
+            }
+
+            @TestMetadata("class.before.Main.kt")
+            public void testClass() throws Exception {
+                runTest("testData/quickfix/autoImports/invisible/class.before.Main.kt");
+            }
+
+            @TestMetadata("fun.before.Main.kt")
+            public void testFun() throws Exception {
+                runTest("testData/quickfix/autoImports/invisible/fun.before.Main.kt");
+            }
+
+            @TestMetadata("property.before.Main.kt")
+            public void testProperty() throws Exception {
+                runTest("testData/quickfix/autoImports/invisible/property.before.Main.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("testData/quickfix/autoImports/kt21515")
         public static class Kt21515 extends AbstractQuickFixMultiFileTest {
             private void runTest(String testDataFilePath) throws Exception {
@@ -2171,6 +2199,19 @@ public abstract class QuickFixMultiFileTestGenerated extends AbstractQuickFixMul
         }
 
         @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/quickfix/typeMismatch/definitelyNonNullableTypes")
+        public static class DefinitelyNonNullableTypes extends AbstractQuickFixMultiFileTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTestWithExtraFile, this, testDataFilePath);
+            }
+
+            @TestMetadata("changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test")
+            public void testChangeParameterTypeIsDisabledWhenDnnFeatureIsOff() throws Exception {
+                runTest("testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
         @TestMetadata("testData/quickfix/typeMismatch/genericVarianceViolation")
         public static class GenericVarianceViolation extends AbstractQuickFixMultiFileTest {
             private void runTest(String testDataFilePath) throws Exception {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 4ff414644dbd..7af4c65f81e2 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -422,6 +422,29 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/quickfix/addConversionCall")
+    public static class AddConversionCall extends AbstractQuickFixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("toByte.kt")
+        public void testToByte() throws Exception {
+            runTest("testData/quickfix/addConversionCall/toByte.kt");
+        }
+
+        @TestMetadata("toByteExtraParenthesis.kt")
+        public void testToByteExtraParenthesis() throws Exception {
+            runTest("testData/quickfix/addConversionCall/toByteExtraParenthesis.kt");
+        }
+
+        @TestMetadata("toShort.kt")
+        public void testToShort() throws Exception {
+            runTest("testData/quickfix/addConversionCall/toShort.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/quickfix/addCrossinline")
     public static class AddCrossinline extends AbstractQuickFixTest {
         private void runTest(String testDataFilePath) throws Exception {
@@ -566,6 +589,49 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/quickfix/addElseBranchToIf")
+    public static class AddElseBranchToIf extends AbstractQuickFixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("error.kt")
+        public void testError() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/error.kt");
+        }
+
+        @TestMetadata("errorWithBlock.kt")
+        public void testErrorWithBlock() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/errorWithBlock.kt");
+        }
+
+        @TestMetadata("inElvis.kt")
+        public void testInElvis() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/inElvis.kt");
+        }
+
+        @TestMetadata("inElvisBlock.kt")
+        public void testInElvisBlock() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/inElvisBlock.kt");
+        }
+
+        @TestMetadata("inElvisWithoutThen.kt")
+        public void testInElvisWithoutThen() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/inElvisWithoutThen.kt");
+        }
+
+        @TestMetadata("withoutCloseParenthesisInCondition.kt")
+        public void testWithoutCloseParenthesisInCondition() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/withoutCloseParenthesisInCondition.kt");
+        }
+
+        @TestMetadata("withoutCondition.kt")
+        public void testWithoutCondition() throws Exception {
+            runTest("testData/quickfix/addElseBranchToIf/withoutCondition.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/quickfix/addEqEqTrue")
     public static class AddEqEqTrue extends AbstractQuickFixTest {
         private void runTest(String testDataFilePath) throws Exception {
@@ -6192,6 +6258,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
         public void testExposedTypeParameterBound() throws Exception {
             runTest("testData/quickfix/decreaseVisibility/exposedTypeParameterBound.kt");
         }
+
+        @TestMetadata("exposedTypeParameterBoundNested.kt")
+        public void testExposedTypeParameterBoundNested() throws Exception {
+            runTest("testData/quickfix/decreaseVisibility/exposedTypeParameterBoundNested.kt");
+        }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
@@ -7585,11 +7656,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/experimental/experimentalUnused.kt");
         }
 
-        @TestMetadata("experimentalUnused2.kt")
-        public void testExperimentalUnused2() throws Exception {
-            runTest("testData/quickfix/experimental/experimentalUnused2.kt");
-        }
-
         @TestMetadata("forbiddenTargetsExpression.kt")
         public void testForbiddenTargetsExpression() throws Exception {
             runTest("testData/quickfix/experimental/forbiddenTargetsExpression.kt");
@@ -7675,11 +7741,6 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/experimental/override.kt");
         }
 
-        @TestMetadata("overrideAnnotationRemove.kt")
-        public void testOverrideAnnotationRemove() throws Exception {
-            runTest("testData/quickfix/experimental/overrideAnnotationRemove.kt");
-        }
-
         @TestMetadata("propertyInConstructor.kt")
         public void testPropertyInConstructor() throws Exception {
             runTest("testData/quickfix/experimental/propertyInConstructor.kt");
@@ -8277,6 +8338,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/increaseVisibility/exposedTypeParameterBound.kt");
         }
 
+        @TestMetadata("exposedTypeParameterBoundNested.kt")
+        public void testExposedTypeParameterBoundNested() throws Exception {
+            runTest("testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt");
+        }
+
         @TestMetadata("invalidSealedClassInheritance.kt")
         public void testInvalidSealedClassInheritance() throws Exception {
             runTest("testData/quickfix/increaseVisibility/invalidSealedClassInheritance.kt");
@@ -8287,6 +8353,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/increaseVisibility/overriddenProtectedMemberToPublicSingleFile.kt");
         }
 
+        @TestMetadata("privateInFileExposesPrivateInFile.kt")
+        public void testPrivateInFileExposesPrivateInFile() throws Exception {
+            runTest("testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt");
+        }
+
         @TestMetadata("privateMemberToInternalSingleFile.kt")
         public void testPrivateMemberToInternalSingleFile() throws Exception {
             runTest("testData/quickfix/increaseVisibility/privateMemberToInternalSingleFile.kt");
@@ -10926,6 +10997,21 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
         public void testBasic() throws Exception {
             runTest("testData/quickfix/removeNoConstructor/basic.kt");
         }
+
+        @TestMetadata("functionType.kt")
+        public void testFunctionType() throws Exception {
+            runTest("testData/quickfix/removeNoConstructor/functionType.kt");
+        }
+
+        @TestMetadata("functionType2.kt")
+        public void testFunctionType2() throws Exception {
+            runTest("testData/quickfix/removeNoConstructor/functionType2.kt");
+        }
+
+        @TestMetadata("suspend.kt")
+        public void testSuspend() throws Exception {
+            runTest("testData/quickfix/removeNoConstructor/suspend.kt");
+        }
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
@@ -15124,6 +15210,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
         }
 
+        @TestMetadata("addElseBranchBooleanWarning.kt")
+        public void testAddElseBranchBooleanWarning() throws Exception {
+            runTest("testData/quickfix/when/addElseBranchBooleanWarning.kt");
+        }
+
         @TestMetadata("addElseBranchEnumStatement.kt")
         public void testAddElseBranchEnumStatement() throws Exception {
             runTest("testData/quickfix/when/addElseBranchEnumStatement.kt");
@@ -15134,6 +15225,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/when/addElseBranchSealed.kt");
         }
 
+        @TestMetadata("addElseBranchSealedWarning.kt")
+        public void testAddElseBranchSealedWarning() throws Exception {
+            runTest("testData/quickfix/when/addElseBranchSealedWarning.kt");
+        }
+
         @TestMetadata("addRemainingBranchesBlankLine.kt")
         public void testAddRemainingBranchesBlankLine() throws Exception {
             runTest("testData/quickfix/when/addRemainingBranchesBlankLine.kt");
@@ -15219,6 +15315,11 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("testData/quickfix/when/addRemainingBranchesSealedStatement.kt");
         }
 
+        @TestMetadata("addRemainingBranchesSealedWarning.kt")
+        public void testAddRemainingBranchesSealedWarning() throws Exception {
+            runTest("testData/quickfix/when/addRemainingBranchesSealedWarning.kt");
+        }
+
         @TestMetadata("breakInWhen.kt")
         public void testBreakInWhen() throws Exception {
             runTest("testData/quickfix/when/breakInWhen.kt");
@@ -15296,6 +15397,19 @@ public abstract class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
 
     @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/quickfix/wrapWhenExpressionInParentheses")
+    public static class WrapWhenExpressionInParentheses extends AbstractQuickFixTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
+        }
+
+        @TestMetadata("logicalExpressionInWhen.kt")
+        public void testLogicalExpressionInWhen() throws Exception {
+            runTest("testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt");
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
     @TestMetadata("testData/quickfix/wrapWithSafeLetCall")
     public static class WrapWithSafeLetCall extends AbstractQuickFixTest {
         private void runTest(String testDataFilePath) throws Exception {
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt
index d9046dd325d8..a8f528721ae4 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt
@@ -5,8 +5,8 @@ package org.jetbrains.kotlin.idea.resolve
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiElement
 import com.intellij.util.ThrowableRunnable
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
 import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR
 import org.jetbrains.kotlin.idea.test.MockLibraryFacility
 import org.jetbrains.kotlin.idea.test.runAll
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
index ab93a0b1042b..e295ccd26fcf 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
@@ -373,6 +373,16 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         runTest("testData/resolve/references/SeveralOverrides.kt");
     }
 
+    @TestMetadata("SuperTypePrimaryConstructor.kt")
+    public void testSuperTypePrimaryConstructor() throws Exception {
+        runTest("testData/resolve/references/SuperTypePrimaryConstructor.kt");
+    }
+
+    @TestMetadata("SuperTypeSecondaryConstructor.kt")
+    public void testSuperTypeSecondaryConstructor() throws Exception {
+        runTest("testData/resolve/references/SuperTypeSecondaryConstructor.kt");
+    }
+
     @TestMetadata("SyntheticProperty.kt")
     public void testSyntheticProperty() throws Exception {
         runTest("testData/resolve/references/SyntheticProperty.kt");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/structuralsearch/KotlinSSResourceInspectionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/structuralsearch/KotlinSSResourceInspectionTest.kt
index 51bf09672dea..9ed96e3e1d3d 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/structuralsearch/KotlinSSResourceInspectionTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/structuralsearch/KotlinSSResourceInspectionTest.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR
 import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
 import org.jetbrains.kotlin.idea.test.util.slashedPath
+import org.jetbrains.kotlin.idea.test.withCustomCompilerOptions
 
 abstract class KotlinSSResourceInspectionTest : BasePlatformTestCase() {
     private var myInspection: SSBasedInspection? = null
@@ -46,7 +47,9 @@ abstract class KotlinSSResourceInspectionTest : BasePlatformTestCase() {
         val message = checkApplicableConstraints(options, PatternCompiler.compilePattern(project, options, true, false))
         assertNull("Constraint applicability error: $message\n", message)
         StructuralSearchProfileActionProvider.createNewInspection(myConfiguration, project)
-        myFixture.testHighlighting(true, false, false)
+        withCustomCompilerOptions(myFixture.file.text, project, module) {
+            myFixture.testHighlighting(true, false, false)
+        }
     }
 
     override fun getTestDataPath(): String = IDEA_TEST_DATA_DIR.resolve("structuralsearch/$basePath").slashedPath
diff --git a/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt b/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt
index 0f32de17d161..3977a31d01f3 100644
--- a/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt
@@ -6,7 +6,7 @@ fun <T: Any, E> T.foo(<warning>x</warning> : E, y : A) : T   {
   y plus 1
   y + 1.0
 
-  <warning>this<warning>?.</warning>minus<T>(this)</warning>
+  this<warning>?.</warning>minus<T>(this)
 
   return this
 }
@@ -64,7 +64,7 @@ fun Int.foo() = this
             command?.equals1(null)
 
             val c = Command()
-            <warning>c<warning>?.</warning>equals2(null)</warning>
+            c<warning>?.</warning>equals2(null)
 
             if (command == null) <warning>1</warning>
         }
diff --git a/plugins/kotlin/idea/tests/testData/checker/PackageInExpressionPosition.kt b/plugins/kotlin/idea/tests/testData/checker/PackageInExpressionPosition.kt
index 43e698d06956..da418b9b46aa 100644
--- a/plugins/kotlin/idea/tests/testData/checker/PackageInExpressionPosition.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/PackageInExpressionPosition.kt
@@ -21,6 +21,6 @@ fun main() {
     <error descr="[NO_COMPANION_OBJECT] Classifier 'System' does not have a companion object, and thus must be initialized here">System</error> is Int
     <error descr="[INVISIBLE_MEMBER] Cannot access '<init>': it is private in 'System'">System</error>()
     (<error descr="[NO_COMPANION_OBJECT] Classifier 'System' does not have a companion object, and thus must be initialized here">System</error>)
-    <warning descr="[REDUNDANT_LABEL_WARNING] Label is redundant, because it can not be referenced in either ''break'', ''continue'', or ''return'' expression">foo@</warning> <error descr="[NO_COMPANION_OBJECT] Classifier 'System' does not have a companion object, and thus must be initialized here">System</error>
+    <warning descr="[REDUNDANT_LABEL_WARNING] Label is redundant, because it can not be referenced in either 'break', 'continue', or 'return' expression">foo@</warning> <error descr="[NO_COMPANION_OBJECT] Classifier 'System' does not have a companion object, and thus must be initialized here">System</error>
     null in <error descr="[NO_COMPANION_OBJECT] Classifier 'System' does not have a companion object, and thus must be initialized here">System</error>
 }
diff --git a/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt b/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt
index 059e6e883c6e..66b4e455eee8 100644
--- a/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt
@@ -1,3 +1,5 @@
+// LANGUAGE_VERSION: 1.6
+
 fun t1() : Int{
   return 0
   <warning>1</warning>
diff --git a/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt
index 88a3b9722ec6..882acfd70273 100644
--- a/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt
@@ -27,7 +27,7 @@ fun nonExhaustiveNullable(c: Color?) = <error descr="[NO_ELSE_IN_WHEN] 'when' ex
 }
 
 fun whenOnEnum(c: Color) {
-    <warning descr="[NON_EXHAUSTIVE_WHEN_STATEMENT] Non exhaustive 'when' statements on enum will be prohibited in 1.7, add 'RED' branch or 'else' branch instead">when</warning>(c) {
+    <error descr="[NO_ELSE_IN_WHEN] 'when' expression must be exhaustive, add necessary 'RED' branch or 'else' branch instead">when</error>(c) {
         Color.BLUE -> {}
         Color.GREEN -> {}
     }
diff --git a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
index 3566bf1a7baa..9737678d772b 100644
--- a/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt
@@ -6,8 +6,8 @@
 package test
 
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): Int defined in test in file topLevelMultifileRuntime.kt
+    fun `<get-x>`(): Int defined in test in file topLevelMultifileRuntime.kt
     fun getX(): Int defined in test in file topLevelMultifileRuntime.kt">val x</error> = 1
 <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (getX()I):
-    fun <get-x>(): Int defined in test in file topLevelMultifileRuntime.kt
+    fun `<get-x>`(): Int defined in test in file topLevelMultifileRuntime.kt
     fun getX(): Int defined in test in file topLevelMultifileRuntime.kt">fun getX()</error> = 1
diff --git a/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt b/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt
index 35f0db36e8d4..af3fd0eda24b 100644
--- a/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt
+++ b/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt
@@ -6,6 +6,6 @@ fun main(<warning>args</warning>: Array<String>) {
 
     val command : Any = 1
 
-    <warning>command<warning>?.</warning>equals(null)</warning>
+    command<warning>?.</warning>equals(null)
     command.equals(null)
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/hints/types/DefinitelyNonNullTypes.kt b/plugins/kotlin/idea/tests/testData/codeInsight/hints/types/DefinitelyNonNullTypes.kt
new file mode 100644
index 000000000000..997c6981f0d3
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/hints/types/DefinitelyNonNullTypes.kt
@@ -0,0 +1,5 @@
+// MODE: all
+fun <T> inlayHint(x: T & Any)<# [:  []T & Any] #> = x
+
+fun <T>takeFun(f: (T & Any) -> Unit) {}
+fun <T> inlayHint2()<# [:  [jar://kotlin-stdlib-sources.jar!/kotlin/Unit.kt:618]Unit] #> = takeFun<T> { it<# [:  []T & Any] #> -> println(it)}
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
index d1c660e5cf1b..f71fea31f151 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/ambiguousSuper.kt.fir.after
@@ -1,5 +1,5 @@
-// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [/C.foo]
-// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [/C.foo]
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [public final override fun foo(): R|kotlin/Unit|]
+// ERROR: [CONFLICTING_OVERLOADS] Conflicting overloads: [public final override fun foo(): R|kotlin/Unit|]
 interface I {
     open fun foo(){}
 }
diff --git a/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.java b/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.java
deleted file mode 100644
index b5f1f83c580f..000000000000
--- a/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.java
+++ /dev/null
@@ -1,11 +0,0 @@
-@java.lang.annotation.Documented()
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
-@java.lang.annotation.Target(value = {})
-@kotlin.annotation.MustBeDocumented()
-@kotlin.annotation.Repeatable()
-@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
-@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER, kotlin.annotation.AnnotationTarget.TYPE})
-public abstract @interface Anno /* Anno*/ {
-  public abstract int i();//  i()
-
-}
diff --git a/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt b/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt
deleted file mode 100644
index b1196da6bb96..000000000000
--- a/plugins/kotlin/idea/tests/testData/compiler/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass_1_6.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// Anno
-// JVM_TARGET: 1.6
-
-@Retention(AnnotationRetention.SOURCE)
-@Target(AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.TYPE)
-@MustBeDocumented
-@Repeatable
-annotation class Anno(val i: Int)
diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall1.txt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall1.txt
index a978a3074d15..125f0d62a812 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall1.txt
+++ b/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall1.txt
@@ -1,3 +1,3 @@
 <!-- upperBoundViolatedInTypeAliasConstructorCall1 -->
-Type parameter bound for Tn in type inferred from type alias expansion for fun <T> <init>(x: T): N<T> /* = Num<T> */
+Type parameter bound for Tn in type inferred from type alias expansion for fun <T> `<init>`(x: T): N<T> /* = Num<T> */
  is not satisfied: inferred type String is not a subtype of Number
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt
index 9f8e28f1fe90..b927adb1ffac 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 import java
 import java.util
 import java.util.List
diff --git a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt.after b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt.after
index 1c703eb16ce7..f2088bd1fe7c 100644
--- a/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/editor/optimizeImports/jvm/Kt1850InnerClass.kt.after
@@ -1,3 +1,4 @@
+// FIR_COMPARISON
 import java.util.List
 import java.util.Map
 
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java
index 6edd228a0ca0..2299d7b96d92 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.0.java
@@ -11,4 +11,6 @@ class J extends A {
         new A();
         new <caret>A(1);
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java
index 8ff923cb269c..e2a4c7092969 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.0.java
@@ -11,4 +11,6 @@ class J extends A {
         new A();
         new A(1);
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
index 168972fa99aa..db9aa6906e73 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.0.java
@@ -11,4 +11,4 @@ public class JJ extends B {
     }
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
index c6c97ba869f0..2ebefebfac45 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.0.java
@@ -11,4 +11,4 @@ public class JJ extends B {
     }
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java
index f754abf71c7d..63ebe79103b5 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java
@@ -15,4 +15,6 @@ public class <caret>A {
     public static void foos() {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java
index eea2d7f95baa..415339a622fb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java
@@ -4,4 +4,5 @@ public class <caret>A {
     public A() {
 
     }
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java
index eea2d7f95baa..415339a622fb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java
@@ -4,4 +4,5 @@ public class <caret>A {
     public A() {
 
     }
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java
index eea2d7f95baa..415339a622fb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java
@@ -4,4 +4,5 @@ public class <caret>A {
     public A() {
 
     }
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java
index 569332ef2bc8..fc0f325e849d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java
@@ -15,4 +15,6 @@ public class <caret>A {
     public static void foos() {
 
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java
index 8bd3a4e406d6..b8503fd0b3ed 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java
@@ -12,4 +12,6 @@ public class Outer {
 
         }
     }
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java
index 2f1ebac5750b..b37cfae82347 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java
@@ -2,4 +2,5 @@
 // OPTIONS: implementingClasses
 public interface <caret>A {
 
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java
index f9aa48b0a173..46a9865f9638 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java
@@ -19,3 +19,4 @@ public class Outer {
     }
 }
 
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/OverridenFlexibleCollection.0.java b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/OverridenFlexibleCollection.0.java
index fa235438c73e..5c62c87149a8 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/OverridenFlexibleCollection.0.java
+++ b/plugins/kotlin/idea/tests/testData/findUsages/java/findJavaMethodUsages/OverridenFlexibleCollection.0.java
@@ -6,3 +6,5 @@ import java.util.Collection;
 abstract public class MyJavaCLass {
     public abstract <T> void me<caret>th(Collection<T> c);
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/companionObject/javaUsage.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
index fcb5bc603e13..306878fa9764 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
@@ -13,3 +13,5 @@ class Foo {
         const val CONST = 42
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt
index 41ed3ec36cce..e24b4bc3bcd3 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt
@@ -4,3 +4,5 @@ package testing
 
 class <caret>Server() {
 }
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt
index aacbd84159cd..9c556fc2fbb7 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt
@@ -11,3 +11,5 @@ open class <caret>Server {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt
index 3e38a0f16bfd..53c62fd5db27 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt
@@ -3,3 +3,5 @@
 package server
 
 annotation class <caret>X(val x: String)
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt
index aeca26171c82..3f84f75a3c97 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt
@@ -15,3 +15,5 @@ open class <caret>Server() {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt
index 44715ee1616b..ab46f3db0a36 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt
@@ -3,3 +3,5 @@
 open class <caret>A {
 
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt
index 48c18e7742e7..ebcabfbcc1ff 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt
@@ -11,3 +11,5 @@ open class <caret>Server {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt
index 4e4f47a30a18..8b03214d3fbe 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.0.kt
@@ -2,4 +2,6 @@
 // OPTIONS: usages, constructorUsages
 open class <caret>A {
     constructor() {}
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedLocalObjects.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedLocalObjects.0.kt
index d7f915430b98..d3baad07b31d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedLocalObjects.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedLocalObjects.0.kt
@@ -7,3 +7,5 @@ interface <caret>X {
 open class A : X {
 
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedObjects.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedObjects.0.kt
index 82fb688edf59..9b52949963e0 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedObjects.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinInterfaceDerivedObjects.0.kt
@@ -11,3 +11,5 @@ open class A : X {
 interface Y : X {
 
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt
index 1deaddc65821..59b1da3a6e8e 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt
@@ -13,3 +13,5 @@ fun foo() {
         val d = object : T() {}
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt
index 8006041c1dd0..82d056c3d119 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.0.kt
@@ -5,4 +5,6 @@ class <caret>A(a: Int = 1)
 fun test() {
     A(0)
     A()
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/interfaceOverrides.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/interfaceOverrides.0.kt
index c87c974cdae0..a0c6dd65125e 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/interfaceOverrides.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/interfaceOverrides.0.kt
@@ -3,3 +3,5 @@
 interface A {
     fun <caret>foo(t: String)
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt
index 154b32fea06f..cb320c87351b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt
@@ -9,3 +9,5 @@ public open class Server() {
 public class ServerEx() : Server() {
     public override fun processRequest() = "foofoo"
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt
index 2f167d25c4dc..6c168d8fb4ae 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.0.kt
@@ -10,3 +10,5 @@ public class ServerEx() : Server() {
     override fun processRequest() = "foofoo"
 }
 
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt
index cfb4a21e2943..9b7107fd4efe 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt
@@ -10,3 +10,5 @@ public class ServerEx() : Server() {
     override fun processRequest() = "foofoo"
 }
 
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt
index 4185a60dd66e..61d4568aa58f 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.0.kt
@@ -16,3 +16,5 @@ fun foo(n: Int) {
 }
 
 val foo: Int = 42
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/labeledReturns.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/labeledReturns.0.kt
index cd098cfaec23..f70fb29b4e32 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/labeledReturns.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/labeledReturns.0.kt
@@ -11,4 +11,4 @@ fun test() {
     foo(fun(): Boolean { return@foo false })
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/overrides.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/overrides.0.kt
index cc0d54b5b72f..c21c48d6cc2e 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/overrides.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/overrides.0.kt
@@ -5,3 +5,5 @@ open class A {
         println(t)
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt
index 0b80be5a9312..fbd107546a8f 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt
@@ -6,3 +6,5 @@ class A {
         var foo: String = "foo"
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt
index 3bfb088d9940..a29ff12ab452 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinAnnotationConstructorParameterUsages.0.kt
@@ -2,3 +2,5 @@
 // OPTIONS: usages
 
 annotation class KotlinAnnForJava(val <caret>p: String)
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
index 73098fab1e34..311ee0d4f0a6 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.0.kt
@@ -3,3 +3,5 @@
 package test
 
 public data class KotlinDataClass(val <caret>foo: Int, val bar: String)
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/annotationEntry.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/annotationEntry.0.kt
index 6239187c9a69..a1ee702b9638 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/annotationEntry.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/annotationEntry.0.kt
@@ -5,4 +5,6 @@ annotation class MyAnnotation()
 @<caret>MyAnnotation
 fun test() {
     MyAnnotation::class.java
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/constructorCall.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/constructorCall.0.kt
index 0357f0eecd53..3aae84f2d64a 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/constructorCall.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/constructorCall.0.kt
@@ -4,4 +4,6 @@ fun test() {
     val kk: KK = <caret>KK()
 }
 
-class KK()
\ No newline at end of file
+class KK()
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt
index 1633fa97f475..eaed633b89ab 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.0.kt
@@ -4,4 +4,5 @@ public class A @JvmOverloads <caret>constructor(
     public val x: Int = 0,
     public val y: Double = 0.0,
     public val z: String = "0"
-)
\ No newline at end of file
+)
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
index 2100ec6f9528..5fee76c7f402 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
@@ -14,4 +14,6 @@ class C() : A(1)
 fun test() {
     A()
     <caret>A(1)
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt
index 5ddd44a48610..ccbbba8a123c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.0.kt
@@ -13,4 +13,6 @@ class C() : A(1)
 fun test() {
     A()
     A(1)
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt
index 912b92dcc161..3abaab776e8d 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.0.kt
@@ -13,4 +13,6 @@ class C() : A(1)
 fun test() {
     A()
     A(1)
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages2.0.kt
index 7f74195ea5a4..3c662c035af9 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages2.0.kt
@@ -7,3 +7,5 @@ class A {
         var <caret>foo: String = "foo"
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt
index b199c87e495e..cd8052d96542 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt
@@ -16,3 +16,5 @@ open class B : A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
index b9e7c60ea5f9..814ca398de1c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt
@@ -15,4 +15,4 @@ open class B : A<String>("") {
         }
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt
index 7c462d09779b..20dcb57a90e9 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt
@@ -16,3 +16,5 @@ open class B : A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
index c04e1c032231..be1ae8cd831c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt
@@ -15,4 +15,4 @@ open class B : A<String>("") {
         }
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages3.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages3.0.kt
index 657aa0967366..8dd8366d2b2f 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages3.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages3.0.kt
@@ -1,4 +1,5 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
 class Test(@JvmField val <caret>foo: String) {
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt
index 2d52a5ece794..7c0409cb5fd4 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt
@@ -16,3 +16,5 @@ open class B : A<String>("") {
             println("set:" + value)
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
index cf2d3121c518..f572a3a53a32 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt
@@ -15,4 +15,4 @@ open class B : A<String>("") {
         }
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/jvmFieldProperty.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/jvmFieldProperty.0.kt
index a823d9b97d0c..f031ba341b36 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/jvmFieldProperty.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/jvmFieldProperty.0.kt
@@ -8,3 +8,5 @@ class A {
         var <caret>foo: String = "foo"
     }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt
index 1b82adaed517..8bf1813ff5e0 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.0.kt
@@ -9,3 +9,5 @@ fun foo() {
 val <caret>foo: Int = 1
 
 val Int.foo: Int get() = 2
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages3.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages3.0.kt
index 010a49ca6ecd..5a52942b4ce2 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages3.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages3.0.kt
@@ -13,3 +13,5 @@ public class ServerEx() : Server() {
     override fun processRequest() = "foo" + foo
 }
 
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt
index 48a6ec34b354..9bacff73aecb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt
@@ -17,3 +17,4 @@ open class B : A<String>() {
             super<A>.foo = value
         }
 }
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt
index b7b87b970ee2..66b2330c74da 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt
@@ -16,3 +16,5 @@ open class B : A<String>("") {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt
index 61e52665268c..81fb9ab15dba 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt
@@ -17,3 +17,5 @@ open class B : A<String>() {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt
index b48e1e7b15f8..31f8dca85d75 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt
@@ -15,3 +15,5 @@ open class B : A<String>("") {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt
index fb5747ea07d3..c9c1d656e380 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt
@@ -18,3 +18,4 @@ open class B : A<String>() {
             super<A>.foo = value
         }
 }
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt
index 83fcbd36b655..5e43de4db847 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt
@@ -16,3 +16,5 @@ open class B : A<String>("") {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kt7656.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kt7656.0.kt
index a4edc86b17da..62352982c842 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kt7656.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kt7656.0.kt
@@ -11,3 +11,5 @@ fun main(args: Array<String>) {
 }
 
 // DISABLE-ERRORS
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/constructorCall.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/constructorCall.0.kt
index fb243dec480d..4bfae4d85bf2 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/constructorCall.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/constructorCall.0.kt
@@ -6,4 +6,6 @@ fun test() {
 
 class KK {
     constructor()
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
index 0517f52214e5..e920e566bba5 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
@@ -28,4 +28,4 @@ fun test() {
     B()
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt
index bbe556b02330..1c2d1841defb 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.0.kt
@@ -3,4 +3,6 @@
 public class A {
     @JvmOverloads
     <caret>constructor(x: Int = 0, y: Double = 0.0, z: String = "0")
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
index b5c2004704c2..2e2980a0b131 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.0.kt
@@ -24,4 +24,4 @@ fun test() {
     B("")
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt
index f1fc27a76694..eaf364cffbe4 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt
@@ -12,3 +12,5 @@ open class <caret>Server {
         println("Server")
     }
 }
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt
index e494a2d736c8..d6e5ea6873c7 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt
@@ -11,3 +11,4 @@ public class ServerEx() : Server() {
     override fun processRequest() = "foofoo"
 }
 
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt
index 20e77d5808b7..a508093479b9 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt
@@ -19,3 +19,5 @@ open class B : A<String>() {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMethodUsages.0.kt
index 6678ff17f3ad..9e74043a9e75 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMethodUsages.0.kt
@@ -10,3 +10,4 @@ public class ServerEx() : Server() {
     override fun processRequest() = "foofoo"
 }
 
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMultiRefInImport.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMultiRefInImport.0.kt
index fa381484ef97..021696305284 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMultiRefInImport.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/kotlinMultiRefInImport.0.kt
@@ -16,3 +16,5 @@ fun foo(n: Int) {
 }
 
 val foo: Int = 42
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
index a6072ef75d16..ad4e5b3aa67c 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findFunctionUsages/usagesOfBaseForFunction.0.kt
@@ -15,4 +15,4 @@ fun main(a: A) {
 }
 
 // for KT-3769 Find usages gives no result for overrides
-// FIR_COMPARISON
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/constructorCall.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/constructorCall.0.kt
index 86229e90179a..24c7eddc4837 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/constructorCall.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/constructorCall.0.kt
@@ -4,4 +4,6 @@ fun test() {
     val kk: KK = <caret>KK()
 }
 
-class KK internal constructor()
\ No newline at end of file
+class KK internal constructor()
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
index 36a42745285c..00ff2a8bdd6b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPrimaryConstructorUsages/primaryConstructorByRef.0.kt
@@ -14,4 +14,6 @@ class C() : A(1)
 fun test() {
     A()
     <caret>A(1)
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinMultiRefInImport.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinMultiRefInImport.0.kt
index 592dad1fcacb..1c7c6e84a24b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinMultiRefInImport.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinMultiRefInImport.0.kt
@@ -9,3 +9,5 @@ fun foo() {
 internal val <caret>foo: Int = 1
 
 val Int.foo: Int get() = 2
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.0.kt
index e44cead19236..22007a0b9869 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.0.kt
@@ -18,3 +18,5 @@ open class B : A<String>() {
             super<A>.foo = value
         }
 }
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/constructorCall.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/constructorCall.0.kt
index 2df9f8587d1b..8739142e6cd9 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/constructorCall.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/constructorCall.0.kt
@@ -6,4 +6,6 @@ fun test() {
 
 class KK {
     internal constructor()
-}
\ No newline at end of file
+}
+
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
index 3608a4988ea9..dbe95cf770dd 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/defaultSecondaryConstructor.0.kt
@@ -28,4 +28,4 @@ fun test() {
     B()
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
index 686e959839bd..4907a7862a88 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findSecondaryConstructorUsages/secondaryConstructor.0.kt
@@ -24,4 +24,4 @@ fun test() {
     B("")
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_COMPARISON
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
index c5489095a3ca..75d82ba9c92b 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.0.kt
@@ -8,4 +8,5 @@ import library.Foo
 
 fun test() {
     val foo: <caret>Foo
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
index 775fbc072320..2c5dc44a9695 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.0.kt
@@ -8,4 +8,5 @@ import library.Foo
 
 fun test() {
     Foo(1).<caret>x = 1
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt
index f913832ffaba..452fd9f22938 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.0.kt
@@ -8,4 +8,5 @@ import library.Foo
 
 fun test() {
     Foo(1).<caret>bar(1)
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
index 45c618c8c830..d6fb28253a72 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.0.kt
@@ -8,4 +8,5 @@ import library.Foo
 
 fun test() {
     Foo.<caret>X = 1
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
index 26041bd259c5..8243527bc820 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.0.kt
@@ -8,4 +8,5 @@ import library.Foo
 
 fun test() {
     Foo.<caret>baz(1)
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
index 3c2b0bc72e37..bf44f23563e5 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.0.kt
@@ -11,4 +11,5 @@ fun test() {
     val a = A.<caret>Companion
 }
 
-// FIR_IGNORE
\ No newline at end of file
+// FIR_IGNORE
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/findUsages/stdlibUsages/LibraryMemberFunctionUsagesInStdlib.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/stdlibUsages/LibraryMemberFunctionUsagesInStdlib.0.kt
index 1e71d0726e9c..1a682ff57ff8 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/stdlibUsages/LibraryMemberFunctionUsagesInStdlib.0.kt
+++ b/plugins/kotlin/idea/tests/testData/findUsages/stdlibUsages/LibraryMemberFunctionUsagesInStdlib.0.kt
@@ -7,4 +7,5 @@ package usages
 
 fun test() {
     val f = mapOf(Pair("1", "2")).keys.<caret>single({ true })
-}
\ No newline at end of file
+}
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.after.kt b/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.after.kt
new file mode 100644
index 000000000000..435ae8cf2d64
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.after.kt
@@ -0,0 +1,8 @@
+fun <T> formattingA(x: T & Any) = x
+fun <T> formattingB(x: T & Any) = x
+fun <T> formattingC(x: T & Any) = x
+fun <T> formattingD(x: T & Any
+) = x
+
+val f = { i: Int & Any -> }
+fun <T : Int & Any> f() = Unit
diff --git a/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.kt b/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.kt
new file mode 100644
index 000000000000..830049dfbd50
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/formatter/DefinitelyNonNullTypes.kt
@@ -0,0 +1,11 @@
+fun <T> formattingA(x: T & Any) = x
+fun <T> formattingB(x: T&Any) = x
+fun <T> formattingC(x: T     &  Any) = x
+fun <T> formattingD(x: T
+                &
+
+                Any
+            ) = x
+
+val f = { i: Int&     Any -> }
+fun <T : Int     &Any> f() = Unit
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/libraryNamesAndLevel/p1/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/libraryNamesAndLevel/p1/build.gradle.kts
index 12b99164ed91..91982878849f 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/libraryNamesAndLevel/p1/build.gradle.kts
+++ b/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/libraryNamesAndLevel/p1/build.gradle.kts
@@ -51,7 +51,7 @@ kotlin {
     }
 
     sourceSets.all {
-        languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
+        languageSettings.optIn("kotlin.RequiresOptIn")
     }
 
     targets.withType<KotlinNativeTarget>().forEach { target ->
diff --git a/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/withPosix/p1/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/withPosix/p1/build.gradle.kts
index 6252242da0c8..6cef2512b8fc 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/withPosix/p1/build.gradle.kts
+++ b/plugins/kotlin/idea/tests/testData/gradle/commonizerImportAndCheckHighlighting/withPosix/p1/build.gradle.kts
@@ -68,7 +68,7 @@ kotlin {
 
 
     sourceSets.all {
-        languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
+        languageSettings.optIn("kotlin.RequiresOptIn")
     }
 
     targets.withType<KotlinNativeTarget>().forEach { target ->
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/build.gradle.kts
new file mode 100644
index 000000000000..63930cb2c325
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/build.gradle.kts
@@ -0,0 +1,36 @@
+plugins {
+    kotlin("multiplatform") version "{{kotlin_plugin_version}}"
+}
+
+repositories {
+    {{kts_kotlin_plugin_repositories}}
+}
+
+kotlin {
+    jvm()
+    js {
+        browser()
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                kotlin("stdlib-common")
+                kotlin("stdlib")
+            }
+        }
+
+        val jvmMain by getting {
+            dependsOn(commonMain)
+        }
+
+        val jsMain by getting {
+        }
+
+        val jsJvm18Main by creating {
+            dependsOn(commonMain)
+            dependsOn(jsMain)
+            dependsOn(jvmMain)
+        }
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/gradle.properties b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/gradle.properties
new file mode 100644
index 000000000000..4267c2d4ebca
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/gradle.properties
@@ -0,0 +1 @@
+{{enable_hmpp_flags}}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/settings.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/settings.gradle.kts
new file mode 100644
index 000000000000..2b5291d16b9e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/settings.gradle.kts
@@ -0,0 +1,10 @@
+rootProject.name = "testProjectName"
+pluginManagement {
+    repositories {
+        {{kts_kotlin_plugin_repositories}}
+    }
+
+    plugins {
+        kotlin("multiplatform") version "{{kotlin_plugin_version}}"
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/commonMain/kotlin/ClassToCheck.kt b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/commonMain/kotlin/ClassToCheck.kt
new file mode 100644
index 000000000000..1bc55cdf59ab
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/commonMain/kotlin/ClassToCheck.kt
@@ -0,0 +1 @@
+expect class ClassToCheck
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/jsJvm18Main/kotlin/mainFile.kt b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/jsJvm18Main/kotlin/mainFile.kt
new file mode 100644
index 000000000000..c04c475d2d59
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationClass/src/jsJvm18Main/kotlin/mainFile.kt
@@ -0,0 +1,7 @@
+actual class ClassToCheck
+
+fun t() {
+    ClassToCh<caret>
+}
+
+class AnotherClassToCheck
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/build.gradle.kts
new file mode 100644
index 000000000000..63930cb2c325
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/build.gradle.kts
@@ -0,0 +1,36 @@
+plugins {
+    kotlin("multiplatform") version "{{kotlin_plugin_version}}"
+}
+
+repositories {
+    {{kts_kotlin_plugin_repositories}}
+}
+
+kotlin {
+    jvm()
+    js {
+        browser()
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                kotlin("stdlib-common")
+                kotlin("stdlib")
+            }
+        }
+
+        val jvmMain by getting {
+            dependsOn(commonMain)
+        }
+
+        val jsMain by getting {
+        }
+
+        val jsJvm18Main by creating {
+            dependsOn(commonMain)
+            dependsOn(jsMain)
+            dependsOn(jvmMain)
+        }
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/gradle.properties b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/gradle.properties
new file mode 100644
index 000000000000..4267c2d4ebca
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/gradle.properties
@@ -0,0 +1 @@
+{{enable_hmpp_flags}}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/settings.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/settings.gradle.kts
new file mode 100644
index 000000000000..2b5291d16b9e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/settings.gradle.kts
@@ -0,0 +1,10 @@
+rootProject.name = "testProjectName"
+pluginManagement {
+    repositories {
+        {{kts_kotlin_plugin_repositories}}
+    }
+
+    plugins {
+        kotlin("multiplatform") version "{{kotlin_plugin_version}}"
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/commonMain/kotlin/myFunctionToCheck.kt b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/commonMain/kotlin/myFunctionToCheck.kt
new file mode 100644
index 000000000000..14b71ec7a65c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/commonMain/kotlin/myFunctionToCheck.kt
@@ -0,0 +1 @@
+expect fun myFunctionToCheck()
diff --git a/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/jsJvm18Main/kotlin/mainFile.kt b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/jsJvm18Main/kotlin/mainFile.kt
new file mode 100644
index 000000000000..b92d5e463362
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/completion/expectAndActualDuplicationFunction/src/jsJvm18Main/kotlin/mainFile.kt
@@ -0,0 +1,10 @@
+actual fun myFunctionToCheck() {
+}
+
+fun t() {
+    myFunction<caret>
+}
+
+fun anotherMyFunctionToCheck() {
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/bottom-mpp/build.gradle b/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/bottom-mpp/build.gradle
index ba1e70b0c2ef..c6a6802586bd 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/bottom-mpp/build.gradle
+++ b/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/bottom-mpp/build.gradle
@@ -30,7 +30,12 @@ kotlin {
             // Creating static library with a custom name.
             staticLib('customNameForiosSimLib') {
                 outputDirectory = file("fooCustomNameForiosSimLib") // outputDir is a `val` property.
-                linkTask.destinationDir = file("fooCustomNameForiosSimLib")
+                if (linkTask.metaClass.hasProperty(linkTask, "destinationDirectory")) {
+                    linkTask.destinationDirectory = project.getObjects().directoryProperty().fileValue(file("fooCustomNameForiosSimLib"))
+                }
+                else {
+                    linkTask.destinationDir = file("fooCustomNameForiosSimLib")
+                }
             }
         }
     }
@@ -39,17 +44,18 @@ kotlin {
     targets.all {
         compilations.all {
             kotlinOptions {
-                freeCompilerArgs += ["-Xprogressive", "-XXLanguage:+NewInference", "-XXLanguage:+SamConversionForKotlinFunctions", "-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xskip-prerelease-check"]
+                freeCompilerArgs +=
+                        ["-Xprogressive", "-XXLanguage:+NewInference", "-XXLanguage:+SamConversionForKotlinFunctions", "-Xuse-experimental=kotlin.ExperimentalMultiplatform", "-Xskip-prerelease-check"]
             }
         }
     }
 
     sourceSets {
         commonMain {
-            dependencies { }
+            dependencies {}
         }
         commonTest {
-            dependencies { }
+            dependencies {}
         }
 
         // creating a diamond
@@ -77,26 +83,26 @@ kotlin {
 
         // setting up the targets source sets
         jvm16Main {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmJavaJvm16Main
         }
         jvm16Test {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmJavaJvm16Test
         }
         jvmWithJavaMain {
-            dependencies {  }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmJavaJvm16Main
             dependsOn jvmWithJavaiOSMain
         }
         jvmWithJavaTest {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmJavaJvm16Test
@@ -104,13 +110,13 @@ kotlin {
         }
 
         iosSimLibMain {
-            dependencies {  }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmWithJavaiOSMain
         }
         iosSimLibTest {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jvmWithJavaiOSTest
diff --git a/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/top-mpp/build.gradle b/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/top-mpp/build.gradle
index bcb324c8e013..9bdda1acc72d 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/top-mpp/build.gradle
+++ b/plugins/kotlin/idea/tests/testData/gradle/hmppImportAndHighlighting/multiModulesHmpp/top-mpp/build.gradle
@@ -6,12 +6,20 @@ version publishing_version
 
 buildscript {
     repositories {
-        {{kotlin_plugin_repositories}}
+        {
+            {
+                kotlin_plugin_repositories
+            }
+        }
     }
 }
 
 repositories {
-    {{kotlin_plugin_repositories}}
+    {
+        {
+            kotlin_plugin_repositories
+        }
+    }
 }
 
 def complexLibAttribute = Attribute.of('org.jetbrains.qa.complexlib', String)
@@ -35,7 +43,12 @@ kotlin {
             // Creating static library with a custom name.
             staticLib('customNameForLinuxLib') {
                 outputDirectory = file("customNameForLinuxLib") // outputDir is a `val` property.
-                linkTask.destinationDir = file("customNameForLinuxLib")
+                if (linkTask.metaClass.hasProperty(linkTask, "destinationDirectory")) {
+                    linkTask.destinationDirectory = project.getObjects().directoryProperty().fileValue(file("customNameForLinuxLib"))
+                }
+                else {
+                    linkTask.destinationDir = file("customNameForLinuxLib")
+                }
             }
         }
     }
@@ -46,7 +59,12 @@ kotlin {
             // Creating static library with a custom name.
             staticLib('customNameForMacosLib') {
                 outputDirectory = file("customNameForMacosLib") // outputDir is a `val` property.
-                linkTask.destinationDir = file("customNameForMacosLib")
+                if (linkTask.metaClass.hasProperty(linkTask, "destinationDirectory")) {
+                    linkTask.destinationDirectory = project.getObjects().directoryProperty().fileValue(file("customNameForMacosLib"))
+                }
+                else {
+                    linkTask.destinationDir = file("customNameForMacosLib")
+                }
             }
         }
     }
@@ -56,7 +74,12 @@ kotlin {
             // KT-29395 fix
             framework {
                 outputDirectory = file("fooDummyiOS") // outputDir is a `val` property.
-                linkTask.destinationDir = file("fooDummyiOS")
+                if (linkTask.metaClass.hasProperty(linkTask, "destinationDirectory")) {
+                    linkTask.destinationDirectory = project.getObjects().directoryProperty().fileValue(file("fooDummyiOS"))
+                }
+                else {
+                    linkTask.destinationDir = file("fooDummyiOS")
+                }
             }
         }
     }
@@ -65,7 +88,8 @@ kotlin {
     targets.all {
         compilations.all {
             kotlinOptions {
-                freeCompilerArgs += ["-Xprogressive", "-XXLanguage:+NewInference", "-XXLanguage:+SamConversionForKotlinFunctions", "-Xuse-experimental=kotlin.ExperimentalMultiplatform"]
+                freeCompilerArgs +=
+                        ["-Xprogressive", "-XXLanguage:+NewInference", "-XXLanguage:+SamConversionForKotlinFunctions", "-Xuse-experimental=kotlin.ExperimentalMultiplatform"]
             }
         }
     }
@@ -73,10 +97,10 @@ kotlin {
     sourceSets {
 
         commonMain {
-            dependencies { }
+            dependencies {}
         }
         commonTest {
-            dependencies { }
+            dependencies {}
         }
 
         // intermediate between commonMain and jsJvm18Main
@@ -97,7 +121,7 @@ kotlin {
 
         jsJvm18iOSTest {
             dependsOn commonTest
-            dependencies { }
+            dependencies {}
         }
         jsLinuxMain {
             dependsOn commonMain
@@ -120,7 +144,7 @@ kotlin {
             dependsOn jsJvm18iOSMain
         }
         jvm18Test {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jsJvm18iOSTest
@@ -145,32 +169,32 @@ kotlin {
             dependsOn jsLinuxTest
         }
         linuxMain {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jsLinuxMain
         }
         linuxTest {
-            dependencies { }
+            dependencies {}
 
             // connecting to the diamond
             dependsOn jsLinuxTest
         }
         macosMain {
-            dependencies { }
+            dependencies {}
         }
         macosTest {
-            dependencies { }
+            dependencies {}
         }
         dummyiOSMain {
             // connecting to the diamond
             dependsOn jsJvm18iOSMain
-            dependencies { }
+            dependencies {}
         }
         dummyiOSTest {
             dependsOn jsJvm18iOSTest
 
-            dependencies { }
+            dependencies {}
         }
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/gradle/importAndCheckHighlighting/commonizeDummyCInterop/p1/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/importAndCheckHighlighting/commonizeDummyCInterop/p1/build.gradle.kts
index 3698b6ca6e9a..31d99b55f626 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/importAndCheckHighlighting/commonizeDummyCInterop/p1/build.gradle.kts
+++ b/plugins/kotlin/idea/tests/testData/gradle/importAndCheckHighlighting/commonizeDummyCInterop/p1/build.gradle.kts
@@ -16,7 +16,7 @@ kotlin {
     arm64Main.dependsOn(nativeMain)
 
     sourceSets.all {
-        languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
+        languageSettings.optIn("kotlin.RequiresOptIn")
     }
 
     x64.compilations.getByName("main").cinterops.create("dummy")
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/app-with-project-dep/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/app-with-project-dep/build.gradle.kts
new file mode 100644
index 000000000000..cf39e594d1e1
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/app-with-project-dep/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    kotlin("{{kpm_plugin_name}}")
+}
+
+kotlin {
+    main.dependencies {
+        api(project(":lib"))
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/build.gradle.kts
new file mode 100644
index 000000000000..21dd2285783b
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/build.gradle.kts
@@ -0,0 +1,35 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
+
+plugins {
+    kotlin("{{kpm_plugin_name}}").apply(false)
+}
+allprojects {
+    pluginManager.withPlugin("org.jetbrains.kotlin.{{kpm_plugin_name}}") {
+        configure<KotlinPm20ProjectExtension> {
+            mainAndTest {
+                jvm
+                val linuxX64 by fragments.creating(KotlinLinuxX64Variant::class)
+                val iosArm64 by fragments.creating(KotlinIosArm64Variant::class)
+                val iosX64 by fragments.creating(KotlinIosX64Variant::class)
+
+                val ios by fragments.creating {
+                    iosArm64.refines(this)
+                    iosX64.refines(this)
+                }
+
+                val jvmAndLinux by fragments.creating {
+                    jvm.refines(this)
+                    linuxX64.refines(this)
+                }
+
+                val native by fragments.creating {
+                    linuxX64.refines(this)
+                    ios.refines(this)
+                }
+            }
+        }
+    }
+}
+
+group = "project"
+version = "1.0"
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/gradle.properties b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/gradle.properties
new file mode 100644
index 000000000000..0480fdcf3ddc
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/lib/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/lib/build.gradle.kts
new file mode 100644
index 000000000000..a0ece5877674
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/lib/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    kotlin("{{kpm_plugin_name}}")
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/settings.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/settings.gradle.kts
new file mode 100644
index 000000000000..7273f9cde775
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/dependencyOnLocalKpmModule/settings.gradle.kts
@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        { { kts_kotlin_plugin_repositories } }
+    }
+    plugins {
+        kotlin("{{kpm_plugin_name}}").version("{{kotlin_plugin_version}}")
+    }
+}
+
+include("lib", "app-with-project-dep")
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/build.gradle.kts
new file mode 100644
index 000000000000..b7fc15b18c82
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/build.gradle.kts
@@ -0,0 +1,42 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
+
+buildscript {
+    repositories {
+        {{kts_kotlin_plugin_repositories}}
+    }
+}
+
+repositories {
+    {{kts_kotlin_plugin_repositories}}
+}
+
+group = "project"
+version = "1.0"
+
+plugins {
+    kotlin("{{kpm_plugin_name}}") version "{{kotlin_plugin_version}}"
+}
+
+kotlin {
+    mainAndTest {
+        jvm
+        val linuxX64 by fragments.creating(KotlinLinuxX64Variant::class)
+        val iosArm64 by fragments.creating(KotlinIosArm64Variant::class)
+        val iosX64 by fragments.creating(KotlinIosX64Variant::class)
+
+        val ios by fragments.creating {
+            iosArm64.refines(this)
+            iosX64.refines(this)
+        }
+
+        val jvmAndLinux by fragments.creating {
+            jvm.refines(this)
+            linuxX64.refines(this)
+        }
+
+        val native by fragments.creating {
+            linuxX64.refines(this)
+            ios.refines(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/gradle.properties b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/gradle.properties
new file mode 100644
index 000000000000..0d6aa7b61fbc
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
diff --git a/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/settings.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/settings.gradle.kts
new file mode 100644
index 000000000000..93484c47dd57
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/kpmImportingTest/simpleKpmProject/settings.gradle.kts
@@ -0,0 +1,5 @@
+pluginManagement {
+    repositories {
+        { { kts_kotlin_plugin_repositories } }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/build.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/build.gradle.kts
new file mode 100644
index 000000000000..26d6dc493230
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/build.gradle.kts
@@ -0,0 +1,32 @@
+plugins {
+    kotlin("multiplatform") version "{{kotlin_plugin_version}}"
+}
+
+kotlin {
+    val hostOs = System.getProperty("os.name")
+    val isMingwX64 = hostOs.startsWith("Windows")
+    val nativeTarget = when {
+        hostOs == "Mac OS X" -> macosX64("native")
+        hostOs == "Linux" -> linuxX64("native")
+        isMingwX64 -> mingwX64("native")
+        else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
+    }
+
+    nativeTarget.apply {
+        binaries {
+            executable {
+                entryPoint = "main"
+            }
+        }
+    }
+    sourceSets {
+        val nativeMain by getting
+        val nativeTest by getting
+        all {
+            languageSettings {
+                languageVersion = "1.6"
+                apiVersion = "1.5"
+            }
+        }
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/settings.gradle.kts b/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/settings.gradle.kts
new file mode 100644
index 000000000000..93484c47dd57
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/gradle/ktij21807KotlinNativeFacet/kotlinNativeFacetContent/settings.gradle.kts
@@ -0,0 +1,5 @@
+pluginManagement {
+    repositories {
+        { { kts_kotlin_plugin_repositories } }
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighter/DefinitelyNonNullableType.kt b/plugins/kotlin/idea/tests/testData/highlighter/DefinitelyNonNullableType.kt
new file mode 100644
index 000000000000..14be7659e9ee
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/highlighter/DefinitelyNonNullableType.kt
@@ -0,0 +1,6 @@
+// LANGUAGE_VERSION: 1.8
+
+fun <<info textAttributesKey="KOTLIN_TYPE_PARAMETER">T</info>> <info textAttributesKey="KOTLIN_FUNCTION_DECLARATION">foo</info>(<info textAttributesKey="KOTLIN_PARAMETER">x</info>: <info textAttributesKey="KOTLIN_TYPE_PARAMETER">T & Any</info>) : <info textAttributesKey="KOTLIN_TYPE_PARAMETER">T & Any</info> {
+    val <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">y</info>: <info textAttributesKey="KOTLIN_TYPE_PARAMETER">T & Any</info> = <info textAttributesKey="KOTLIN_PARAMETER">x</info>
+    return <info textAttributesKey="KOTLIN_LOCAL_VARIABLE">y</info>
+}
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt
index ade4259212f2..e6c5511f7eb0 100644
--- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt
@@ -1 +1,2 @@
+// FIR_IDENTICAL
 val weekYear = java.util.Calendar.getInstance().weekYear
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting
index 9127f5c1efcc..158cef530e8e 100644
--- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting
+++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting
@@ -1 +1,2 @@
+// FIR_IDENTICAL
 val <!HIGHLIGHTING("textAttributesKey='KOTLIN_PACKAGE_PROPERTY'")!>weekYear<!> = java.util.<!HIGHLIGHTING("textAttributesKey='KOTLIN_ABSTRACT_CLASS'")!>Calendar<!>.<!HIGHLIGHTING("textAttributesKey='KOTLIN_FUNCTION_CALL'")!>getInstance<!>().<!HIGHLIGHTING("textAttributesKey='KOTLIN_SYNTHETIC_EXTENSION_PROPERTY'")!>weekYear<!>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting.fir b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting.fir
deleted file mode 100644
index f8bfeb933297..000000000000
--- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/SyntheticExtensionProperty.kt.highlighting.fir
+++ /dev/null
@@ -1 +0,0 @@
-val <!HIGHLIGHTING("textAttributesKey='KOTLIN_PACKAGE_PROPERTY'")!>weekYear<!> = java.util.<!HIGHLIGHTING("textAttributesKey='KOTLIN_ABSTRACT_CLASS'")!>Calendar<!>.<!HIGHLIGHTING("textAttributesKey='KOTLIN_FUNCTION_CALL'"), HIGHLIGHTING("textAttributesKey='KOTLIN_SYNTHETIC_EXTENSION_PROPERTY'")!>getInstance<!>().<!HIGHLIGHTING("textAttributesKey='KOTLIN_SYNTHETIC_EXTENSION_PROPERTY'")!>weekYear<!>
diff --git a/plugins/kotlin/idea/tests/testData/inspections/cleanup/basic/basic.kt.after b/plugins/kotlin/idea/tests/testData/inspections/cleanup/basic/basic.kt.after
index 293e00d7a58f..6a21aaeb5773 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/cleanup/basic/basic.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspections/cleanup/basic/basic.kt.after
@@ -67,45 +67,44 @@ val x = C() willBeInfix 1
 fun bar(yield: Int = 4) {}
 
 fun yield(yield: Int) {
-    "$`yield`"
-    "${`yield`}"
+    "$yield"
+    "${yield}"
 
-    `yield`
-    val foo = `yield` + `yield`
-    val foo2 = `yield`
+    yield
+    val foo = yield + yield
+    val foo2 = yield
 
     // bar(yield = 5) //this is different in old and new inference, should be tested in compiler
 
     yield(4)
-    yield() {}
+    yield {}
 
-    class yield<T: `yield`<T>>
+    class yield<T: yield<T>>
 
-    return@`yield`
-    return@`yield` Unit
+    return@yield
+    return@yield Unit
 
-    val foo5: `yield`<*>
+    val foo5: yield<*>
 }
 
 fun yield(i: (Int) -> Unit) {}
 
 annotation class yield
 
-@`yield`()
+@yield()
 fun test2(p: Int) {
-    `yield`@ p
+    yield@ p
 
-    @`yield`
-    fun f() {}
+    @yield fun f() {}
 }
 
 object X {
     fun yield() {}
 
     fun test3(yield: Int) {
-        X::`yield`
+        X::yield
 
-        `yield`::toInt
+        yield::toInt
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/inspections/dfa/InlineLambda.kt b/plugins/kotlin/idea/tests/testData/inspections/dfa/InlineLambda.kt
index e073ab52ba69..087ef10fbb45 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/dfa/InlineLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/inspections/dfa/InlineLambda.kt
@@ -92,7 +92,7 @@ fun atLeastOnce() {
     if (<warning descr="Condition 'x == 2' is always true">x == 2</warning>) {}
 }
 
-@<warning descr="[OPT_IN_IS_NOT_ENABLED] This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'">OptIn</warning>(kotlin.contracts.ExperimentalContracts::class)
+@OptIn(kotlin.contracts.ExperimentalContracts::class)
 inline fun runAtLeastOnce(lambda: () -> Unit) {
     contract {
         callsInPlace(lambda, InvocationKind.AT_LEAST_ONCE)
diff --git a/plugins/kotlin/idea/tests/testData/inspections/nonExhaustiveWhenStatementMigration/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/inspections/nonExhaustiveWhenStatementMigration/inspectionData/inspections.test
index 651b6864d661..4e48bbf99978 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/nonExhaustiveWhenStatementMigration/inspectionData/inspections.test
+++ b/plugins/kotlin/idea/tests/testData/inspections/nonExhaustiveWhenStatementMigration/inspectionData/inspections.test
@@ -1,2 +1,2 @@
 // INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.migration.NonExhaustiveWhenStatementMigrationInspection
-// LANGUAGE_LEVEL 1.6
\ No newline at end of file
+// LANGUAGE_VERSION: 1.6
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/complexRedundantLet/binarySafeCall.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/complexRedundantLet/binarySafeCall.kt
index fde54d62b62a..805e9f471def 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/complexRedundantLet/binarySafeCall.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/complexRedundantLet/binarySafeCall.kt
@@ -1,3 +1,4 @@
+// ERROR: Type mismatch: inferred type is Int? but Int was expected
 // PROBLEM: none
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToAssignment/whenHasMissingCase.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToAssignment/whenHasMissingCase.kt
index 8cd145ff7141..1b87250571e5 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToAssignment/whenHasMissingCase.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToAssignment/whenHasMissingCase.kt
@@ -1,3 +1,4 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class TestEnum{
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToReturn/whenHasMissingCase.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToReturn/whenHasMissingCase.kt
index ddb360ec2742..40eace848841 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToReturn/whenHasMissingCase.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/liftOut/whenToReturn/whenHasMissingCase.kt
@@ -1,4 +1,5 @@
 // ERROR: A 'return' expression required in a function with a block body ('{...}')
+// ERROR: 'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class TestEnum{
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/.inspection b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/.inspection
new file mode 100644
index 000000000000..2493535afb59
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/.inspection
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.migration.OverrideDeprecatedMigrationInspection
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt
new file mode 100644
index 000000000000..341f08918555
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt
@@ -0,0 +1,10 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use")
+    open fun foo() {}
+}
+
+class Derived : Base() {
+    override fun <caret>foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt.after
new file mode 100644
index 000000000000..4dda269eb815
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation1.kt.after
@@ -0,0 +1,11 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use")
+    open fun foo() {}
+}
+
+class Derived : Base() {
+    @Deprecated("Don't use")
+    override fun foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt
new file mode 100644
index 000000000000..b5f4b9e139c0
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt
@@ -0,0 +1,10 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    open fun foo() {}
+}
+
+class Derived : Base() {
+    override fun <caret>foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt.after
new file mode 100644
index 000000000000..6a4b672a9c30
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation2.kt.after
@@ -0,0 +1,11 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    open fun foo() {}
+}
+
+class Derived : Base() {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    override fun foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt
new file mode 100644
index 000000000000..7eeb057ddacb
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt
@@ -0,0 +1,12 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated(message = "Don't use", replaceWith = ReplaceWith("bar()"))
+    open fun foo() {}
+
+    open fun bar() {}
+}
+
+class Derived : Base() {
+    override fun <caret>foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt.after
new file mode 100644
index 000000000000..78af76716e23
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation3.kt.after
@@ -0,0 +1,13 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated(message = "Don't use", replaceWith = ReplaceWith("bar()"))
+    open fun foo() {}
+
+    open fun bar() {}
+}
+
+class Derived : Base() {
+    @Deprecated("Don't use", replaceWith = ReplaceWith("bar()"))
+    override fun foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt
new file mode 100644
index 000000000000..451bf941c080
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt
@@ -0,0 +1,12 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.HIDDEN, replaceWith = ReplaceWith("bar()", "p", "q"))
+    open fun foo() {}
+
+    open fun bar() {}
+}
+
+class Derived : Base() {
+    override fun <caret>foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt.after
new file mode 100644
index 000000000000..9e0b8bf5e080
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecation4.kt.after
@@ -0,0 +1,13 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.HIDDEN, replaceWith = ReplaceWith("bar()", "p", "q"))
+    open fun foo() {}
+
+    open fun bar() {}
+}
+
+class Derived : Base() {
+    @Deprecated("Don't use", replaceWith = ReplaceWith("bar()", "p", "q"), level = DeprecationLevel.HIDDEN)
+    override fun foo() {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt
new file mode 100644
index 000000000000..6f1b1ebdcb02
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt
@@ -0,0 +1,12 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    open var x: Int = 0
+}
+
+class Derived : Base() {
+    override var <caret>x: Int
+        get() = 0
+        set(value) {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt.after
new file mode 100644
index 000000000000..f97df3a2ce39
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/overrideDeprecatedMigration/copyDeprecationProperty.kt.after
@@ -0,0 +1,13 @@
+// WITH_STDLIB
+
+open class Base {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    open var x: Int = 0
+}
+
+class Derived : Base() {
+    @Deprecated("Don't use", level = DeprecationLevel.ERROR)
+    override var x: Int
+        get() = 0
+        set(value) {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantUnitExpression/unitReturnType5.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantUnitExpression/unitReturnType5.kt
index f6eeec4facce..1ca529ae96d3 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantUnitExpression/unitReturnType5.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantUnitExpression/unitReturnType5.kt
@@ -1,3 +1,4 @@
+// PROBLEM: none
 // WITH_RUNTIME
 fun <T> doIt(p: () -> T): T = p()
 fun Any.doDo() = Unit
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/simpleRedundantLet/binarySafeCall.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/simpleRedundantLet/binarySafeCall.kt
index fde54d62b62a..805e9f471def 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/simpleRedundantLet/binarySafeCall.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/simpleRedundantLet/binarySafeCall.kt
@@ -1,3 +1,4 @@
+// ERROR: Type mismatch: inferred type is Int? but Int was expected
 // PROBLEM: none
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisWhenUnitNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisWhenUnitNonExhaustive.kt
index 82cbd9c78f7a..bf8e7f0173aa 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisWhenUnitNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisWhenUnitNonExhaustive.kt
@@ -1,3 +1,4 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'RW' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class AccessMode { READ, WRITE, RW }
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitNonExhaustive.kt
index 8123adc86584..23f5741cf1aa 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitNonExhaustive.kt
@@ -1,3 +1,4 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'RW' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class AccessMode { READ, WRITE, RW }
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt
index 4a9c7a26ad32..195cf1075e32 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt
@@ -1,4 +1,6 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'RW' branch or 'else' branch instead
 // IS_APPLICABLE: true
+
 enum class AccessMode { READ, WRITE, RW }
 fun <T> run(f: () -> T) = f()
 fun whenExpr(access: AccessMode) {
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt.after
index aa37ea55f7c4..8f4784c5e4dc 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt.after
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt.after
@@ -1,4 +1,6 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'RW' branch or 'else' branch instead
 // IS_APPLICABLE: true
+
 enum class AccessMode { READ, WRITE, RW }
 fun <T> run(f: () -> T) = f()
 fun whenExpr(access: AccessMode) = run {
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitNonExhaustive.kt
index d1f703ce9fd4..bd0f4d010b10 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitNonExhaustive.kt
@@ -1,3 +1,4 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'RW' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class AccessMode { READ, WRITE, RW }
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenWhenNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenWhenNonExhaustive.kt
index 8f3b5c7c9807..07b7bb0fbe1c 100644
--- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenWhenNonExhaustive.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenWhenNonExhaustive.kt
@@ -1,3 +1,4 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'false' branch or 'else' branch instead
 // PROBLEM: none
 
 enum class AccessMode { READ, WRITE, RW }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addPropertyAccessors/getter/const.kt b/plugins/kotlin/idea/tests/testData/intentions/addPropertyAccessors/getter/const.kt
index a3b8c18acfbf..92711eee3d12 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addPropertyAccessors/getter/const.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/addPropertyAccessors/getter/const.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Const 'val' are only allowed on top level or in objects
+// ERROR: Const 'val' are only allowed on top level, in named objects, or in companion objects
 class Test {
     const val x<caret> = 1
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt
index 999150014517..8b63dfd73e44 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt
@@ -1,4 +1,6 @@
 // WITH_RUNTIME
+// ERROR: 'when' expression must be exhaustive, add necessary 'FOO', 'BAR', 'BAZ' branches or 'else' branch instead
+// SKIP_ERRORS_AFTER
 
 enum class Entry {
     FOO, BAR, BAZ
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt.after
index 74da19c64ebf..d6e3980373c7 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/emptyWhen.kt.after
@@ -1,4 +1,6 @@
 // WITH_RUNTIME
+// ERROR: 'when' expression must be exhaustive, add necessary 'FOO', 'BAR', 'BAZ' branches or 'else' branch instead
+// SKIP_ERRORS_AFTER
 
 enum class Entry {
     FOO, BAR, BAZ
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt
index b9e0ba75b1af..a207c17505f9 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt
@@ -1,4 +1,6 @@
 // WITH_RUNTIME
+// ERROR: 'when' expression must be exhaustive, add necessary 'BAR', 'BAZ' branches or 'else' branch instead
+// SKIP_ERRORS_AFTER
 
 enum class Entry {
     FOO, BAR, BAZ
diff --git a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt.after
index 6d138ef578de..8f2adcdd0930 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/addWhenRemainingBranches/noElse.kt.after
@@ -1,4 +1,6 @@
 // WITH_RUNTIME
+// ERROR: 'when' expression must be exhaustive, add necessary 'BAR', 'BAZ' branches or 'else' branch instead
+// SKIP_ERRORS_AFTER
 
 enum class Entry {
     FOO, BAR, BAZ
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
index f00deb956523..9119cad33954 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt
@@ -1,3 +1,6 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'false' branch or 'else' branch instead
+// SKIP_ERRORS_AFTER
+
 // AFTER-WARNING: The expression is unused
 // AFTER-WARNING: The expression is unused
 fun foo(i : Int) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
index acae8238c431..6d22608b7d34 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenTrueOrFalse3.kt.after
@@ -1,3 +1,6 @@
+// ERROR: 'when' expression must be exhaustive, add necessary 'false' branch or 'else' branch instead
+// SKIP_ERRORS_AFTER
+
 // AFTER-WARNING: The expression is unused
 // AFTER-WARNING: The expression is unused
 fun foo(i : Int) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt
index 715cc3694df6..4c22fd404415 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt
@@ -1,5 +1,4 @@
 // AFTER-WARNING: Parameter 'args' is never used
-// AFTER-WARNING: Safe call on a non-null receiver will have nullable type in future releases
 // AFTER-WARNING: Unnecessary safe call on a non-null receiver of type B?
 // AFTER-WARNING: Variable 'x' is never used
 class B {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt.after
index 8108859a3e21..7973d7819975 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt.after
@@ -1,5 +1,4 @@
 // AFTER-WARNING: Parameter 'args' is never used
-// AFTER-WARNING: Safe call on a non-null receiver will have nullable type in future releases
 // AFTER-WARNING: Unnecessary safe call on a non-null receiver of type B?
 // AFTER-WARNING: Variable 'x' is never used
 class B {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunction.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunction.kt
new file mode 100644
index 000000000000..c4ed7237089c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunction.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+interface Interface {
+    <caret>fun f(): String
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt
new file mode 100644
index 000000000000..884424fe0b3d
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt
@@ -0,0 +1,5 @@
+interface Interface {
+    <caret>fun f(): String {
+        return ""
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt.after b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt.after
new file mode 100644
index 000000000000..02eb0e51d17c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithBody.kt.after
@@ -0,0 +1,5 @@
+interface Interface {
+    <caret>private fun f(): String {
+        return ""
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt
new file mode 100644
index 000000000000..f18f07350608
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt
@@ -0,0 +1,3 @@
+interface Interface {
+    <caret>fun f(): String = ""
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt.after b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt.after
new file mode 100644
index 000000000000..ec5930ea3ab7
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceFunctionWithExpressionBody.kt.after
@@ -0,0 +1,3 @@
+interface Interface {
+    <caret>private fun f(): String = ""
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interface.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceProperty.kt
index 4cd500e6b9e2..4cd500e6b9e2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interface.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfaceProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt
new file mode 100644
index 000000000000..8e8292ecfa67
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt
@@ -0,0 +1,6 @@
+interface Interface {
+    <caret>val x: String
+        get() {
+            return ""
+        }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt.after
new file mode 100644
index 000000000000..08f2686e1202
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/private/interfacePropertyWithGetter.kt.after
@@ -0,0 +1,6 @@
+interface Interface {
+    <caret>private val x: String
+        get() {
+            return ""
+        }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/protected/notForInterfaceMember.kt b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/protected/notForInterfaceMember.kt
new file mode 100644
index 000000000000..40eeb5632d1e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/intentions/changeVisibility/protected/notForInterfaceMember.kt
@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+interface Foo {
+    <caret>val bar: String
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt
index 45c4fa1d7c0a..38bae493a663 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt
@@ -1,2 +1,2 @@
-// AFTER-WARNING: Label is redundant, because it can not be referenced in either ''break'', ''continue'', or ''return'' expression
+// AFTER-WARNING: Label is redundant, because it can not be referenced in either 'break', 'continue', or 'return' expression
 fun foo(): Int = <caret>ann@ 1
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt.after
index 17e27b179579..3e2d3fc3819e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/labeledExpr.kt.after
@@ -1,4 +1,4 @@
-// AFTER-WARNING: Label is redundant, because it can not be referenced in either ''break'', ''continue'', or ''return'' expression
+// AFTER-WARNING: Label is redundant, because it can not be referenced in either 'break', 'continue', or 'return' expression
 fun foo(): Int {
     return (ann@ 1)
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt
index e4521ac04753..d323cb5be7c9 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// AFTER-WARNING: Label is redundant, because it can not be referenced in either ''break'', ''continue'', or ''return'' expression
+// AFTER-WARNING: Label is redundant, because it can not be referenced in either 'break', 'continue', or 'return' expression
 fun main() {
     outer@
     <caret>for (i in 1..100) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt.after
index 87b24ec82c97..87a09744ec6b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToForEachFunctionCall/continueToReturnWithLabel.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// AFTER-WARNING: Label is redundant, because it can not be referenced in either ''break'', ''continue'', or ''return'' expression
+// AFTER-WARNING: Label is redundant, because it can not be referenced in either 'break', 'continue', or 'return' expression
 fun main() {
     outer@
     <caret>(1..100).forEach { i ->
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt
index 87e619d39876..0e74c9fffd8c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'reduceIndexedOrNull'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt.after
index bbc20db5353b..64c6dcbe3669 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceOrNull.kt.after
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'reduceIndexedOrNull'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt
index bd39ca848c14..43438b43c3c5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'reduceRightIndexedOrNull'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt.after
index c07cc659f1fb..69e08cc96425 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/reduceRightOrNull.kt.after
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'reduceRightIndexedOrNull'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt
index 240fc096fa5e..4a6eb5f85d8f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'runningReduceIndexed'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt.after
index 6e4bf1e18885..5ac1d39d4e76 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/runningReduce.kt.after
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'runningReduceIndexed'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt
index 2d3ad4faed2e..df24a93a21b1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'scanIndexed'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt.after
index 964319238674..756345413ee1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scan.kt.after
@@ -1,6 +1,5 @@
 // INTENTION_TEXT: "Convert to 'scanIndexed'"
 // WITH_RUNTIME
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt
index 325cc561484b..af3d35641a28 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt
@@ -1,7 +1,6 @@
 // INTENTION_TEXT: "Convert to 'runningReduceIndexed'"
 // WITH_RUNTIME
 // DISABLE-ERRORS
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt.after
index 1383f908cba6..f1cdb95b439e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/convertToIndexedFunctionCall/basic/scanReduce.kt.after
@@ -1,7 +1,6 @@
 // INTENTION_TEXT: "Convert to 'runningReduceIndexed'"
 // WITH_RUNTIME
 // DISABLE-ERRORS
-// AFTER-WARNING: This annotation should be used with the compiler argument '-opt-in=kotlin.RequiresOptIn'
 // TODO: fix warning?
 // AFTER-WARNING: Parameter 'index' is never used, could be renamed to _
 @OptIn(ExperimentalStdlibApi::class)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt
index 530904b7dba5..960080850b7b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Elvis operator (?:) always returns the left operand of non-nullable type Int
 // AFTER-WARNING: Parameter 'v' is never used
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt.after
index 0876f8e53a1f..27bc5aa28749 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Elvis operator (?:) always returns the left operand of non-nullable type Int
 // AFTER-WARNING: Parameter 'v' is never used
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt
index 79340b5e40f7..065c3387c29f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'v' is never used
 fun test() {
     foo(false || !true) + foo(<caret>false || !true)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt.after
index 6fb8d818bff2..b61c037051f5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/notReduceableBinary2.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'v' is never used
 fun test() {
     foo(false || !true) + foo(false)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt
index ef2ce83b5222..7a5e54639d9b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo() {
     +0.0f <caret>== +0.0f
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt.after
index d32b94768fe8..901801bef4f8 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/positiveZeroNegativeZero3.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo() {
     true
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt
index 0e3b8ac6747b..1672fdc42519 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'y' is never used
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt.after
index b135121c2baa..d2e8479bf292 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'y' is never used
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt
index f76e58679f09..a282ef9d2499 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
     <caret>2 > 1 && y || y || (3 + 3 > 10)
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt.after
index f0ee441be8c5..7f5bd8a0d79a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
     y || y
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt
index 67b28b48d94b..fdaf65e74514 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
     <caret>3 != 3 && 2 > 1 || y
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt.after
index 08011c60da89..4d08d263a5fe 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: The expression is unused
 fun foo(y: Boolean) {
     y
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt
index d84e118b653b..006d43bfadc2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'y' is never used
 fun foo(y: Boolean) {
     val x = 3
diff --git a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt.after b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt.after
index 2452d6630d0c..4a51f3f0b06e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // AFTER-WARNING: Parameter 'y' is never used
 fun foo(y: Boolean) {
     val x = 3
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findCommonSuperclass/directives.txt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findCommonSuperclass/directives.txt
new file mode 100644
index 000000000000..bbab0cbc2fc6
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findCommonSuperclass/directives.txt
@@ -0,0 +1,2 @@
+
+// FIR_COMPARISON
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads.kt
index e2918d3cfb67..f20772c3c041 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 class A {
     operator fun get(x: String) = 1
     operator fun get(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads2.kt
index 8790929cd55b..cdbc50388b29 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/arrayAccess/Overloads2.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 class A {
     operator fun get(x: String) = 1
     operator fun get(x: String, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Deprecated.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Deprecated.kt
index 49468dd87298..aa135cae330f 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Deprecated.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Deprecated.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 @Deprecated("") fun f(x: Int) = 2
 fun f(x: Int, y: Boolean) = 3
 
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedFunctions.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedFunctions.kt
index 8d6deb2c351c..23b50a94186e 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedFunctions.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedFunctions.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt
index 7755fc5c1842..ef365038939c 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/InheritedWithCurrentFunctions.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments.kt
index 7c05e798b606..ee42dd4f567d 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Boolean, y: Int) = 1
     fun m(x: Boolean, y: Int, z: Int) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments2.kt
index 364e8432ecdc..0ce703d4ebea 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/MixedNamedArguments2.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 // COMPILER_ARGUMENTS: -XXLanguage:-MixedNamedArgumentsInTheirOwnPosition
 
 open class A(x: Int) {
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter.kt
index 3ac694738577..bde552daa515 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter2.kt
index 62c23e909d65..f2a41a0d080b 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NamedParameter2.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
index 91da429799ca..13c9160a236a 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR
 // WITH_RUNTIME
 
 class A
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
index 35916c56b146..fff4b7c0ddd0 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/NoShadowedDeclarations2.kt
@@ -1,3 +1,4 @@
+// IGNORE_FIR
 fun A.some(s: String) {
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Println.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Println.kt
index 138e1a0acc0a..bb9caf70a859 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Println.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/Println.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun xprintln(x: String) {}
     fun xprintln() {}
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExpectedType.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExpectedType.kt
index 259de9330215..139d54e00f46 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExpectedType.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExpectedType.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun test() {
     foo(mapOf(<caret>))
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt
index d32c3aa47857..04c7513c3c62 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteExplicitTypeArgs.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun test() {
     mapOf<Int, String>(<caret>)
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt
index 3ed55f44802a..9b219ce746d8 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/SubstituteFromArguments1.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 fun test() {
     mapOf(<caret>1 to "")
 }
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctions.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctions.kt
index ee0fa494562e..a4e1cecac443 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctions.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctions.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt
index 7dab813aefe8..3cb79ac2217a 100644
--- a/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt
+++ b/plugins/kotlin/idea/tests/testData/parameterInfo/functionCall/TwoFunctionsGrey.kt
@@ -1,4 +1,3 @@
-// IGNORE_FIR
 open class A(x: Int) {
     fun m(x: Int) = 1
     fun m(x: Int, y: Boolean) = 2
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt
new file mode 100644
index 000000000000..3ef73af490c4
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt
@@ -0,0 +1,7 @@
+// "Convert expression to 'Byte'" "true"
+
+fun takeByte(x: Byte) {}
+
+fun foo() {
+    takeByte(1 + 1<caret>)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt.after
new file mode 100644
index 000000000000..f5521622e4ad
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByte.kt.after
@@ -0,0 +1,7 @@
+// "Convert expression to 'Byte'" "true"
+
+fun takeByte(x: Byte) {}
+
+fun foo() {
+    takeByte((1 + 1).toByte()<caret>)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt
new file mode 100644
index 000000000000..63883c28908b
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt
@@ -0,0 +1,7 @@
+// "Convert expression to 'Byte'" "true"
+
+fun takeByte(x: Byte) {}
+
+fun foo() {
+    takeByte(1 + (1 + 1)<caret>)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt.after
new file mode 100644
index 000000000000..eb7d35fc4413
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toByteExtraParenthesis.kt.after
@@ -0,0 +1,7 @@
+// "Convert expression to 'Byte'" "true"
+
+fun takeByte(x: Byte) {}
+
+fun foo() {
+    takeByte((1 + (1 + 1)).toByte()<caret>)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt
new file mode 100644
index 000000000000..863657e931c1
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt
@@ -0,0 +1,7 @@
+// "Convert expression to 'Short'" "true"
+
+fun takeShort(x: Short) {}
+
+fun foo() {
+    takeShort(1 + 1<caret>)
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt.after
new file mode 100644
index 000000000000..c0613ed376b6
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addConversionCall/toShort.kt.after
@@ -0,0 +1,7 @@
+// "Convert expression to 'Short'" "true"
+
+fun takeShort(x: Short) {}
+
+fun foo() {
+    takeShort((1 + 1).toShort())
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt
new file mode 100644
index 000000000000..1575dc2008c5
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt
@@ -0,0 +1,5 @@
+// "Add else branch" "true"
+// ERROR: Unresolved reference: TODO
+fun foo(x: String?) {
+    val a = i<caret>f (x == null) 4
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt.after
new file mode 100644
index 000000000000..22513a2189f6
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/error.kt.after
@@ -0,0 +1,5 @@
+// "Add else branch" "true"
+// ERROR: Unresolved reference: TODO
+fun foo(x: String?) {
+    val a = if (x == null) 4 else <selection><caret>TODO()</selection>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt
new file mode 100644
index 000000000000..657313c56726
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt
@@ -0,0 +1,6 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    val a = i<caret>f (x == null) {
+        4
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt.after
new file mode 100644
index 000000000000..18e70d6ba7c0
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/errorWithBlock.kt.after
@@ -0,0 +1,8 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    val a = if (x == null) {
+        4
+    } else {
+        <caret>
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt
new file mode 100644
index 000000000000..a22738e9d72e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt
@@ -0,0 +1,5 @@
+// "Add else branch" "true"
+// ERROR: Unresolved reference: TODO
+fun foo(x: String?) {
+    x ?: i<caret>f (x == null) return
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt.after
new file mode 100644
index 000000000000..a1703b69a004
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvis.kt.after
@@ -0,0 +1,5 @@
+// "Add else branch" "true"
+// ERROR: Unresolved reference: TODO
+fun foo(x: String?) {
+    x ?: if (x == null) return else <selection><caret>TODO()</selection>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt
new file mode 100644
index 000000000000..708ed9a20d05
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt
@@ -0,0 +1,6 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    x ?: i<caret>f (x == null) {
+        return
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt.after
new file mode 100644
index 000000000000..96b7c8937810
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisBlock.kt.after
@@ -0,0 +1,8 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    x ?: if (x == null) {
+        return
+    } else {
+        <caret>
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisWithoutThen.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisWithoutThen.kt
new file mode 100644
index 000000000000..e389d2e9bbef
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/inElvisWithoutThen.kt
@@ -0,0 +1,9 @@
+// "Add else branch" "false"
+// ACTION: Introduce local variable
+// ACTION: Remove braces from 'while' statement
+
+fun foo(x: String?) {
+    while (true) {
+        x ?: i<caret>f (x == null)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCloseParenthesisInCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCloseParenthesisInCondition.kt
new file mode 100644
index 000000000000..b48db8e8f516
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCloseParenthesisInCondition.kt
@@ -0,0 +1,7 @@
+// "Add else branch" "false"
+// ACTION: Replace property initializer with 'if' expression
+// ERROR: 'if' must have both main and 'else' branches if used as an expression
+
+fun foo(x: String?) {
+    val a = i<caret>f (
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCondition.kt
new file mode 100644
index 000000000000..6578aa1d58ee
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/addElseBranchToIf/withoutCondition.kt
@@ -0,0 +1,7 @@
+// "Add else branch" "false"
+// ACTION: Replace property initializer with 'if' expression
+// ERROR: 'if' must have both main and 'else' branches if used as an expression
+
+fun foo(x: String?) {
+    val a = i<caret>f
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt b/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
index 292d41bf83d7..638adc97526c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/allowResolveInWriteAction.txt
@@ -75,4 +75,5 @@ org.jetbrains.kotlin.idea.quickfix.SpecifyTypeExplicitlyFix
 org.jetbrains.kotlin.idea.quickfix.SuperClassNotInitialized$AddParenthesisFix
 org.jetbrains.kotlin.idea.quickfix.WrapWithSafeLetCallFix
 com.intellij.spring.model.highlighting.autowire.SpringUastInjectionPointsAutowiringInspection$AddSpringBeanQualifierFix
-org.jetbrains.kotlin.idea.compilerPlugin.parcelize.quickfixes.ParcelMigrateToParcelizeQuickFix
\ No newline at end of file
+org.jetbrains.kotlin.idea.compilerPlugin.parcelize.quickfixes.ParcelMigrateToParcelizeQuickFix
+org.jetbrains.kotlin.idea.quickfix.AddConversionCallFix
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
index 1b9357b165a4..2e67316220af 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/delegateExtensionBoth.test
@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
-// ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' and thus it cannot serve as a delegate for var (read-write property)
+// ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [Error type: Error delegation type for DelegateImpl<Int>()])' and thus it cannot serve as a delegate for var (read-write property)
 
 package testing
 
@@ -28,7 +28,7 @@ public operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProper
 // FILE: first.after.kt
 // "Import" "true"
 // ERROR: Type 'DelegateImpl<Int>' has no method 'getValue(BigTest, KProperty<*>)' and thus it cannot serve as a delegate
-// ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' and thus it cannot serve as a delegate for var (read-write property)
+// ERROR: Type 'DelegateImpl<Int>' has no method 'setValue(BigTest, KProperty<*>, [Error type: Error delegation type for DelegateImpl<Int>()])' and thus it cannot serve as a delegate for var (read-write property)
 
 package testing
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.after.kt
new file mode 100644
index 000000000000..b812d8dac7ad
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.after.kt
@@ -0,0 +1,10 @@
+// "Import" "true"
+// ERROR: Cannot access 'F': it is private in file
+// ERROR: Cannot access 'F': it is private in file
+
+package my.pack
+
+import simple.F
+
+@F<caret>()
+class A
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt
new file mode 100644
index 000000000000..570849706b5c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency.kt
@@ -0,0 +1,3 @@
+package my.pack
+
+private annotation class F
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt
new file mode 100644
index 000000000000..1f74ec9c0659
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Dependency2.kt
@@ -0,0 +1,3 @@
+package simple
+
+annotation class F
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Main.kt
new file mode 100644
index 000000000000..f190eba1aabd
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/annotation.before.Main.kt
@@ -0,0 +1,8 @@
+// "Import" "true"
+// ERROR: Cannot access 'F': it is private in file
+// ERROR: Cannot access 'F': it is private in file
+
+package my.pack
+
+@F<caret>()
+class A
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.after.kt
new file mode 100644
index 000000000000..71a2e5c0254b
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.after.kt
@@ -0,0 +1,10 @@
+// "Import" "true"
+// ERROR: Cannot access 'F': it is private in file
+
+package my.pack
+
+import simple.F
+
+fun main() {
+    val f: F<caret>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt
new file mode 100644
index 000000000000..fe5582230823
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency.kt
@@ -0,0 +1,3 @@
+package my.pack
+
+private class F
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt
new file mode 100644
index 000000000000..3b24e202ac69
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Dependency2.kt
@@ -0,0 +1,3 @@
+package simple
+
+class F
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Main.kt
new file mode 100644
index 000000000000..a69ac361a903
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/class.before.Main.kt
@@ -0,0 +1,8 @@
+// "Import" "true"
+// ERROR: Cannot access 'F': it is private in file
+
+package my.pack
+
+fun main() {
+    val f: F<caret>
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.after.kt
new file mode 100644
index 000000000000..a022076f479d
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.after.kt
@@ -0,0 +1,10 @@
+// "Import" "true"
+// ERROR: Cannot access 'f': it is private in file
+
+package my.pack
+
+import simple.f
+
+fun main() {
+    <caret>f()
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt
new file mode 100644
index 000000000000..f6e92fa71e63
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency.kt
@@ -0,0 +1,3 @@
+package my.pack
+
+private fun f() = Unit
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt
new file mode 100644
index 000000000000..e105ad118f04
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Dependency2.kt
@@ -0,0 +1,3 @@
+package simple
+
+fun f() = Unit
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Main.kt
new file mode 100644
index 000000000000..6566f68b5828
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/fun.before.Main.kt
@@ -0,0 +1,8 @@
+// "Import" "true"
+// ERROR: Cannot access 'f': it is private in file
+
+package my.pack
+
+fun main() {
+    <caret>f()
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.after.kt
new file mode 100644
index 000000000000..d63287f4f7c1
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.after.kt
@@ -0,0 +1,10 @@
+// "Import" "true"
+// ERROR: Cannot access 'f': it is private in file
+
+package my.pack
+
+import simple.f
+
+fun main() {
+    <caret>f
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt
new file mode 100644
index 000000000000..ee614115c462
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency.kt
@@ -0,0 +1,3 @@
+package my.pack
+
+private val f = 42
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt
new file mode 100644
index 000000000000..a87d3b28807c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Dependency2.kt
@@ -0,0 +1,3 @@
+package simple
+
+val f = 42
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Main.kt
new file mode 100644
index 000000000000..92a9abef8e82
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/invisible/property.before.Main.kt
@@ -0,0 +1,8 @@
+// "Import" "true"
+// ERROR: Cannot access 'f': it is private in file
+
+package my.pack
+
+fun main() {
+    <caret>f
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
index b4474d992461..ae1fd5fc9333 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.after.kt
@@ -5,3 +5,5 @@ import bar.div
 fun foo() {
     2 <selection><caret></selection>/ ""
 }
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
index 71a2de04cb42..2a1633a79285 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/autoImports/mismatchingArgs/extensionOperator.before.Main.kt
@@ -2,4 +2,6 @@
 // ERROR: None of the following functions can be called with the arguments supplied: <br>public final operator fun div(other: Byte): Int defined in kotlin.Int<br>public final operator fun div(other: Double): Double defined in kotlin.Int<br>public final operator fun div(other: Float): Float defined in kotlin.Int<br>public final operator fun div(other: Int): Int defined in kotlin.Int<br>public final operator fun div(other: Long): Long defined in kotlin.Int<br>public final operator fun div(other: Short): Int defined in kotlin.Int
 fun foo() {
     2 <caret>/ ""
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
index f62407f96f96..8a86545fd6b2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.after.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = B.Foo<Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
index 194b187a194b..a14fd14a46c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMember.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = B.<caret>Foo<Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
index 6d9af98f681a..12cdffdb5a1a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.after.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.Foo<Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
index ee27a78a071e..2d1d6fb8d5da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInner.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.<caret>Foo<Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
index 2bb5082fb6b4..f91bf4cb0f53 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.after.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.Foo<String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
index a372a98d192a..1586a39656bb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerPartialSubstitution.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.<caret>Foo<String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
index 4e8ad4506682..aca27cf9a161 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.after.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.Foo<T, Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
index 759291470a79..4329e12ee95d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberInnerWithReceiverArg.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = b.<caret>Foo<T, Int, String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
index 5aa81397ff8e..a3859606c32a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.after.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = B.Foo<String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
index b7f2e9895dfb..99c34c118ad6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     internal fun test() = B.<caret>Foo<String>(2, "2")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
index ebc3a95cc97b..e143356fb0ab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.after.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
index 0c990c906bac..2e4452583089 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMember.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
index 7a7b1758819e..c803a60b957f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.after.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
index c1a57bfbb18f..f704fee53707 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberPartialSubstitution.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
index ebc3a95cc97b..e143356fb0ab 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.after.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
index d8428c3b7d33..baaaab7473ac 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/javaClassMemberWithReceiverArg.before.Main.kt
@@ -1,5 +1,6 @@
 // "Create member function 'B.foo'" "true"
 // ERROR: Unresolved reference: foo
+// ERROR: 'public' property exposes its 'public/*package*/' type B
 
 class A<T> internal constructor(val b: B<T>) {
     fun test(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt
index 9fbd6a0cd027..697f6b66a0c7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt
@@ -1,4 +1,9 @@
-// "Create extension function 'Test.invoke'" "true"
+// "Create extension function 'Test.invoke'" "false"
+// ACTION: Add explicit type arguments
+// ACTION: Create function 't'
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun <T, R> DeepRecursiveFunction<TypeVariable(T), TypeVariable(R)>.invoke(value: TypeVariable(T)): TypeVariable(R) defined in kotlin
+
+// KTIJ-1262 "Create extension function 'Test.invoke'" quickfix should suggest for variable with lambda argument
 class Test
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after
deleted file mode 100644
index 70f64b900eb0..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after
+++ /dev/null
@@ -1,13 +0,0 @@
-// "Create extension function 'Test.invoke'" "true"
-class Test
-
-fun test() {
-    var t = Test()
-    t{
-
-    }
-}
-
-private operator fun Test.invoke(function: () -> Unit) {
-    TODO("Not yet implemented")
-}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt
index 670ec66e4fcf..3695e8cd2094 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt
@@ -2,7 +2,7 @@
 // ERROR: Unresolved reference: _
 // ERROR: Unresolved reference: _
 // ERROR: Unresolved reference: _
-// ERROR: Type mismatch: inferred type is A<I> but A<List<[ERROR : _]>> was expected
+// ERROR: Type mismatch: inferred type is A<I> but A<List<[Error type: Unresolved type for _]>> was expected
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 class A<T : List<T>>
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt.after
index f681c9ba0403..93b3367b5f22 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/classWithExplicationAndRecursiveUpperBound.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Unresolved reference: _
 // ERROR: Unresolved reference: _
 // ERROR: Unresolved reference: _
-// ERROR: Type mismatch: inferred type is A<I> but A<List<[ERROR : _]>> was expected
+// ERROR: Type mismatch: inferred type is A<I> but A<List<[Error type: Unresolved type for _]>> was expected
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 class A<T : List<T>>
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBoundNested.kt b/plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBoundNested.kt
new file mode 100644
index 000000000000..da8513796cfd
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/decreaseVisibility/exposedTypeParameterBoundNested.kt
@@ -0,0 +1,11 @@
+// "Make 'PrivateInFileClass' private" "false"
+// ACTION: Create test
+// ACTION: Enable a trailing comma by default in the formatter
+// ACTION: Import members from 'PrivateInFileClass'
+// ACTION: Introduce import alias
+// ACTION: Make 'PrivateInnerClass' public
+// ERROR: 'private-in-file' generic exposes its 'private-in-class' parameter bound type PrivateInnerClass
+
+private class PrivateInFileClass<T : <caret>PrivateInFileClass.PrivateInnerClass> {
+    private class PrivateInnerClass
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/typeAliases/constructorUsageWithConflict.kt b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/typeAliases/constructorUsageWithConflict.kt
index b7fb4b958e43..a60e7d2b6d3a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/typeAliases/constructorUsageWithConflict.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/deprecatedSymbolUsage/typeAliases/constructorUsageWithConflict.kt
@@ -4,7 +4,7 @@
 // ACTION: Convert to block body
 // ACTION: Introduce import alias
 // ACTION: Introduce local variable
-// ACTION: Replace usages of '<init>(): Old /* = OldClass */' in whole project
+// ACTION: Replace usages of '`<init>`(): Old /* = OldClass */' in whole project
 // ACTION: Replace with 'NewClass(12)'
 
 @Deprecated("Use NewClass", replaceWith = ReplaceWith("NewClass"))
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt
index b984a59f3c0c..d2a371be010b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt
@@ -1,5 +1,5 @@
 // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after
index 6d29de45ce0d..bcf168c30e7a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/annotationInTopLevelProperty.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt
index 9bf0fe6578b2..97564526a39a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationToAnnotationList.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:[
     JvmName("Foo")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after
index fe2bf749a03f..18037fb00330 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToAnnotationList.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationToAnnotationList.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:[
     JvmName("Foo")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt
index 17675dcfe0b5..7ff29f8d94c8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationToOtherFileAnnotations.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:JvmName("Foo")
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after
index 572667647054..1c99fd44c837 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationToOtherFileAnnotations.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationToOtherFileAnnotations.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:JvmName("Foo")
 @file:OptIn(A::class)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt
index 56199e7be4e8..21d05b738cb3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationWithAnnotationList.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:[
     JvmName("Foo")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after
index a1937fc5a634..6f10e648d0a9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/appendFileAnnotationWithAnnotationList.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'appendFileAnnotationWithAnnotationList.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:[
     JvmName("Foo")
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt
index e87f5d842df8..cf3342c8dcdd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'bar'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after
index fb62d4015b3d..e0b9f386231b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunction.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'bar'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt
index 9ca3e0a443ee..c0e5084b3048 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Bar'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after
index c78a4c0a0335..dd9233850dcc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionContainingClass.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to containing class 'Bar'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt
index 27dd1a1d5989..a8c23a9abcfa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicFunctionNotApplicable.kt
@@ -6,8 +6,8 @@
 // ACTION: Opt in for 'MyExperimentalAPI' on containing class 'Bar'
 // ACTION: Opt in for 'MyExperimentalAPI' in containing file 'basicFunctionNotApplicable.kt'
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
-// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
-// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
 // ERROR: This annotation is not applicable to target 'member function'
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt
index 4f2232127c8f..3b00293539cb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt
@@ -1,6 +1,6 @@
 // "Opt in for 'MyExperimentalAPI' on 'bar'" "true"
 // PRIORITY: HIGH
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 package a.b
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after
index 700c97af0080..962fc31dbb7f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/basicUseExperimental.kt.after
@@ -1,6 +1,6 @@
 // "Opt in for 'MyExperimentalAPI' on 'bar'" "true"
 // PRIORITY: HIGH
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 package a.b
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt
index 819f495774d4..f1107f1f64aa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt
@@ -1,6 +1,6 @@
 // "Opt in for 'MyExperimentalAPI' on containing class 'Bar'" "true"
 // PRIORITY: HIGH
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 package a.b
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after
index cc0f80a62612..883cb2c05aa0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/classUseExperimental.kt.after
@@ -1,6 +1,6 @@
 // "Opt in for 'MyExperimentalAPI' on containing class 'Bar'" "true"
 // PRIORITY: HIGH
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 package a.b
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt
index 8aa08a2cf8b8..55aa91320ecb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'B' in containing file 'existingFileAnnotationWithPackage.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:OptIn(A::class)
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after
index f33e1604a79f..64d3b0f2f8cd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/existingFileAnnotationWithPackage.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'B' in containing file 'existingFileAnnotationWithPackage.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:OptIn(A::class, B::class)
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt
index 581100aec6c8..7f9454dd4ae8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused.kt
@@ -1,5 +1,5 @@
 // "Safe delete 'Marker'" "false"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -Xopt-in=test.Marker
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn -opt-in=test.Marker
 // WITH_RUNTIME
 // ACTION: Rename file to Marker.kt
 // TOOL: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt
deleted file mode 100644
index b7d809144bfe..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/experimentalUnused2.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// "Safe delete 'Marker'" "false"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn -opt-in=test.Marker
-// WITH_RUNTIME
-// ACTION: Rename file to Marker.kt
-// TOOL: org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection
-
-package test
-
-@RequiresOptIn
-annotation class <caret>Marker
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt
index 820252a29254..31ef3a150000 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt
@@ -1,5 +1,5 @@
 // "Remove forbidden opt-in annotation targets" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @RequiresOptIn
 @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.EXPRESSION, AnnotationTarget.FUNCTION)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after
index af4782c86c12..296b50137b1a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsExpression.kt.after
@@ -1,5 +1,5 @@
 // "Remove forbidden opt-in annotation targets" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @RequiresOptIn
 @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt
index 5152c963c5fc..29f10e848e27 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt
@@ -1,5 +1,5 @@
 // "Remove forbidden opt-in annotation targets" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @RequiresOptIn
 @Target(<caret>AnnotationTarget.CLASS, AnnotationTarget.TYPE, AnnotationTarget.FUNCTION, AnnotationTarget.FILE)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after
index 6874136c695d..affeaec23307 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/forbiddenTargetsInAnnotation.kt.after
@@ -1,5 +1,5 @@
 // "Remove forbidden opt-in annotation targets" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @RequiresOptIn
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt
index de6ed8b5c026..e03cd1ef5a54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after
index d912b70d06bf..177e98d1902b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/functionInLocalClass.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt
index c345faaef564..e5e4ef54966c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after
index 3b974107bf3f..9e22c925fcd4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicit.kt.after
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt
index f6b3f5a95822..e68854825a54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after
index 661202585416..01b94726b71f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteExplicitRemove.kt.after
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt
index 30bbef7548f8..0a4f785b18f9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after
index c37231219415..1a196c27fcb6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicit.kt.after
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from getter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt
index b37085a490f9..c69eb1768bd1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after
index a5d78ce56058..43d50c749d93 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/getterUseSiteImplicitRemove.kt.after
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt
index bf75d4e271a2..799f14f582f9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after
index 9e752d4d4ce8..8edbc4c76de6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localFunction.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'MyExperimentalAPI' opt-in requirement to 'outer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt
index cc7c16589074..afd31260f12e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after
index fc176f7e878e..b3abe9fe5b3b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationNoInitRemove.kt.after
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt
index fb5d4d363d2a..f5a9ff232d13 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after
index bb022c6b0e26..10992f8d9f4d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableAnnotationRemove.kt.after
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt
index fb0bc3056bef..8185a88e2101 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/localVariableNoGetterAction.kt
@@ -1,5 +1,5 @@
 // "Move '@SomeOptInAnnotation' annotation from getter to property" "false"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Remove annotation
 // ERROR: Opt-in requirement marker annotation cannot be used on variable
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt
index 102adf136630..ccdb238df866 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/nestedClasses.kt
@@ -8,7 +8,7 @@
 // ACTION: Opt in for 'MyExperimentalAPI' in containing file 'nestedClasses.kt'
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
 // ACTION: Introduce import alias
-// ERROR: This declaration is experimental and its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
 
 @RequiresOptIn
 annotation class MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt
index e9516225e0b0..16170d292226 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'newFileAnnotationWithPackage.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 package p
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after
index 1447a589dc24..74453e9589bf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/newFileAnnotationWithPackage.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'A' in containing file 'newFileAnnotationWithPackage.kt'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 @file:OptIn(A::class)
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt
index d9d5b8bf16d6..eb6376704fd1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/override.kt
@@ -8,7 +8,7 @@
 // ACTION: Add '-opt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
 // ACTION: Enable a trailing comma by default in the formatter
 // ACTION: Go To Super Method
-// ERROR: This declaration overrides experimental member of supertype 'Base' and must be annotated with '@MyExperimentalAPI'
+// ERROR: Base declaration of supertype 'Base' needs opt-in. The declaration override must be annotated with '@MyExperimentalAPI' or '@OptIn(MyExperimentalAPI::class)'
 
 @RequiresOptIn
 @Target(AnnotationTarget.FUNCTION)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt
deleted file mode 100644
index 434cf3d11133..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
-// WITH_RUNTIME
-
-@RequiresOptIn
-annotation class SomeOptInAnnotation
-
-open class Base {
-    open fun foo() {}
-}
-
-class Derived : Base() {
-    <caret>@SomeOptInAnnotation
-    override fun foo() {}
-}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after
deleted file mode 100644
index b81d3ee301ed..000000000000
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/overrideAnnotationRemove.kt.after
+++ /dev/null
@@ -1,14 +0,0 @@
-// "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
-// WITH_RUNTIME
-
-@RequiresOptIn
-annotation class SomeOptInAnnotation
-
-open class Base {
-    open fun foo() {}
-}
-
-class Derived : Base() {
-    override fun foo() {}
-}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt
index 2486d8fb2d18..78e22690e719 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt
@@ -1,5 +1,5 @@
 // "Propagate 'PropertyTypeMarker' opt-in requirement to constructor" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Propagate 'PropertyTypeMarker' opt-in requirement to containing class 'PropertyTypeContainer'
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after
index d6f59076bad9..99f4d6d98d03 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructor.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'PropertyTypeMarker' opt-in requirement to constructor" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Propagate 'PropertyTypeMarker' opt-in requirement to containing class 'PropertyTypeContainer'
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt
index 71b4c3cbc179..2a0783e15251 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeContainer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Opt in for 'PropertyTypeMarker' on constructor
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after
index 7afd56a61d26..239c9e62cef7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToClass.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeContainer'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Opt in for 'PropertyTypeMarker' on constructor
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt
index be36ea913563..308a7b1ba2b5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt
@@ -1,5 +1,5 @@
 // "Opt in for 'PropertyTypeMarker' on constructor" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeMarker'
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after
index 74a5c9659d7c..4d43027b0a79 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/propertyInConstructorAddOptInToConstructor.kt.after
@@ -1,5 +1,5 @@
 // "Opt in for 'PropertyTypeMarker' on constructor" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 // ACTION: Opt in for 'PropertyTypeMarker' on containing class 'PropertyTypeMarker'
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test
index d87f01b9e73b..4fad1fef7170 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage.test
@@ -1,8 +1,8 @@
 // FILE: first.before.kt
 // "Opt in for 'Ann' on 'test'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
 import `fun`.optin.C
 
 fun test(c: C<caret>) {
@@ -21,9 +21,9 @@ class C
 
 // FILE: first.after.kt
 // "Opt in for 'Ann' on 'test'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
 import `fun`.optin.Ann
 import `fun`.optin.C
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test
index 3321b647f78b..de51a65cb4e2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/reservedKeywordPackage2.test
@@ -1,8 +1,8 @@
 // FILE: first.before.kt
 // "Propagate 'Ann' opt-in requirement to 'test'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
 import `fun`.optin.C
 
 fun test(c: C<caret>) {
@@ -21,9 +21,9 @@ class C
 
 // FILE: first.after.kt
 // "Propagate 'Ann' opt-in requirement to 'test'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ERROR: This declaration is experimental and its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
+// ERROR: This declaration needs opt-in. Its usage must be marked with '@fun.optin.Ann' or '@OptIn(fun.optin.Ann::class)'
 import `fun`.optin.Ann
 import `fun`.optin.C
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt
index 2bbd72cc0f16..759629c4c4c4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt
@@ -3,6 +3,7 @@
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
 // WITH_RUNTIME
+// LANGUAGE_VERSION: 1.6
 
 @RequiresOptIn<caret>
 annotation class MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after
index 34eecd50d60c..504505641a16 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOn.kt.after
@@ -3,6 +3,7 @@
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
 // WITH_RUNTIME
+// LANGUAGE_VERSION: 1.6
 
 @RequiresOptIn
 annotation class MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt
index 35ae0128c93a..09f76af0b90c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt
@@ -3,6 +3,7 @@
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
 // WITH_RUNTIME
+// LANGUAGE_VERSION: 1.6
 
 @RequiresOptIn<caret>
 annotation class MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after
index 3afda672360a..bafed185cd37 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/switchOnWithAnotherMarker.kt.after
@@ -3,6 +3,7 @@
 // COMPILER_ARGUMENTS_AFTER: -version -opt-in=AnotherMarker -opt-in=kotlin.RequiresOptIn
 // DISABLE-ERRORS
 // WITH_RUNTIME
+// LANGUAGE_VERSION: 1.6
 
 @RequiresOptIn
 annotation class MyExperimentalAPI
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt
index 6b1e6e5ab668..9d4679f5cc24 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt
@@ -1,7 +1,6 @@
 // "Opt in for 'AliasMarker' on 'AliasMarkerUsage'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ACTION: Add '-Xopt-in=AliasMarker' to module light_idea_test_case compiler arguments
 
 @RequiresOptIn
 annotation class AliasMarker
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after
index 0e5460cc6908..b552ba99d797 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeAlias.kt.after
@@ -1,7 +1,6 @@
 // "Opt in for 'AliasMarker' on 'AliasMarkerUsage'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
-// ACTION: Add '-Xopt-in=AliasMarker' to module light_idea_test_case compiler arguments
 
 @RequiresOptIn
 annotation class AliasMarker
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt
index 32a2517aa1ee..0b44ab8330e2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt
@@ -1,5 +1,5 @@
 // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after
index 6d29de45ce0d..bcf168c30e7a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/typeInTopLevelProperty.kt.after
@@ -1,5 +1,5 @@
 // "Propagate 'TopMarker' opt-in requirement to 'topUserVal'" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt
index 25f21d98a806..0811111519cf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from value parameter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after
index 60a363d4f9e0..0d0c6c42b8c9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationAddExplicitUseSite.kt.after
@@ -1,5 +1,5 @@
 // "Move 'SomeOptInAnnotation' opt-in requirement from value parameter to property" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt
index fbc1d76a6392..6642efd9b5f6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after
index 7ca9de802b01..d839d3980f7e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/experimental/valueParameterAnnotationRemove.kt.after
@@ -1,5 +1,5 @@
 // "Remove annotation" "true"
-// COMPILER_ARGUMENTS: -Xopt-in=kotlin.RequiresOptIn
+// COMPILER_ARGUMENTS: -opt-in=kotlin.RequiresOptIn
 // WITH_RUNTIME
 
 @RequiresOptIn
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt
new file mode 100644
index 000000000000..d259ec44baad
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt
@@ -0,0 +1,9 @@
+// "Make 'PrivateInnerClass' public" "true"
+// ACTION: Create test
+// ACTION: Enable a trailing comma by default in the formatter
+// ACTION: Import members from 'PrivateInFileClass'
+// ACTION: Introduce import alias
+
+private class PrivateInFileClass<T : <caret>PrivateInFileClass.PrivateInnerClass> {
+    private class PrivateInnerClass
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt.after
new file mode 100644
index 000000000000..a95b4bd09457
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/exposedTypeParameterBoundNested.kt.after
@@ -0,0 +1,9 @@
+// "Make 'PrivateInnerClass' public" "true"
+// ACTION: Create test
+// ACTION: Enable a trailing comma by default in the formatter
+// ACTION: Import members from 'PrivateInFileClass'
+// ACTION: Introduce import alias
+
+private class PrivateInFileClass<T : <caret>PrivateInFileClass.PrivateInnerClass> {
+    class PrivateInnerClass
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt
new file mode 100644
index 000000000000..ab0c99d8d96e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt
@@ -0,0 +1,6 @@
+// "Make 'Private' public" "true"
+
+private interface I2 {
+    private class Private
+    fun <caret>pp() = Private()
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt.after
new file mode 100644
index 000000000000..0e2cce58564b
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/increaseVisibility/privateInFileExposesPrivateInFile.kt.after
@@ -0,0 +1,6 @@
+// "Make 'Private' public" "true"
+
+private interface I2 {
+    class Private
+    fun <caret>pp() = Private()
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.after.kt
index eab6eea463d2..e4d23d7c6407 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.after.kt
@@ -1,6 +1,6 @@
 // "Add 'Any' as upper bound for T to make it non-nullable" "true"
 // ERROR: Type mismatch: inferred type is T but T & Any was expected
-// LANGUAGE_VERSION: 1.7
+// LANGUAGE_VERSION: 1.8
 
 fun <T : Any> bar(x: T) {
     Foo<T>().foo(x)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.before.Main.kt
index cf9d2317b983..0f93baf750a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaError.before.Main.kt
@@ -1,6 +1,6 @@
 // "Add 'Any' as upper bound for T to make it non-nullable" "true"
 // ERROR: Type mismatch: inferred type is T but T & Any was expected
-// LANGUAGE_VERSION: 1.7
+// LANGUAGE_VERSION: 1.8
 
 fun <T> bar(x: T) {
     Foo<T>().foo(<caret>x)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.after.kt
index c5f9c836c0bb..bbd79599ee8c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.after.kt
@@ -1,6 +1,6 @@
 // "Add 'Any' as upper bound for T to make it non-nullable" "true"
 // ERROR: 'foo' overrides nothing
-// LANGUAGE_VERSION: 1.7
+// LANGUAGE_VERSION: 1.8
 
 class FooChild<T : Any> : Foo<T>() {
     override fun foo(x: T) {}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.before.Main.kt
index d76ed6ee3b89..fccedb1b32d5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makeUpperBoundNonNullable/withJavaOverrideError.before.Main.kt
@@ -1,6 +1,6 @@
 // "Add 'Any' as upper bound for T to make it non-nullable" "true"
 // ERROR: 'foo' overrides nothing
-// LANGUAGE_VERSION: 1.7
+// LANGUAGE_VERSION: 1.8
 
 class FooChild<T> : Foo<T>() {
     override<caret> fun foo(x: T) {}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt
index d8a960860379..e8c68674f7cc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInLogic.kt
@@ -3,7 +3,6 @@
 // ACTION: Flip '>'
 // ACTION: Replace '&&' with '||'
 // ACTION: Replace overloaded operator with function call
-// ACTION: Simplify boolean expression
 // ACTION: Expand boolean expression to 'if else'
 // ERROR: Operator call corresponds to a dot-qualified call 'w?.x.compareTo(42)' which is not allowed on a nullable receiver 'w?.x'.
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt
new file mode 100644
index 000000000000..3af8778e0eb1
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class A : () -> Int()<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt.after
new file mode 100644
index 000000000000..91eeb82f99fb
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType.kt.after
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class A : () -> Int<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt
new file mode 100644
index 000000000000..2ab27b807458
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class B : (() -> Int)()<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt.after
new file mode 100644
index 000000000000..0928c0589bd7
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/functionType2.kt.after
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class B : (() -> Int)<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt
new file mode 100644
index 000000000000..ca0b19d6fc06
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class D : suspend () -> Int()<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt.after
new file mode 100644
index 000000000000..4029517f3a6c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/removeNoConstructor/suspend.kt.after
@@ -0,0 +1,3 @@
+// "Remove constructor call" "true"
+
+abstract class D : suspend () -> Int<caret>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
index 64b360208417..9f523d17999e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 
 fun <T : Any> foo(x: T) {
     val y = x?.toString()<caret>
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
index 7041a4259e0d..95ef58efe7e6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability.kt.after
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 
 fun <T : Any> foo(x: T) {
     val y = x.toString()
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
index e7da212d51eb..95cadd28a18b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 
 fun test(x: String) {
     x?.le<caret>ngth
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
index 8bf4be1bda33..307638f74757 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/callWillChangeNullability2.kt.after
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 
 fun test(x: String) {
     x.length
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain.kt.after
index 0d8d3ab5bef8..2a6766dee14a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain.kt.after
@@ -4,6 +4,6 @@ class Bar(val baz: Baz)
 class Baz(val qux: Int)
 
 fun test(foo: Foo) {
-    foo.bar.baz.qux
+    foo.bar?.baz?.qux
 }
 /* IGNORE_FIR */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain2.kt.after
index 69bf0883d204..a30fab88cd77 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain2.kt.after
@@ -4,6 +4,6 @@ class Bar(val baz: Baz?)
 class Baz(val qux: Int)
 
 fun test(foo: Foo) {
-    foo.bar.baz?.qux
+    foo.bar?.baz?.qux
 }
 /* IGNORE_FIR */
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
index a919b050138f..c6d651b8539f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 // Note: quick fix is available after the execution due to a separate warning (SAFE_CALL_WILL_CHANGE_NULLABILITY)
 class Foo(val bar: Bar)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
index 7e1d95872725..e38af93d3e3a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithDotCall/safeCallChain3.kt.after
@@ -1,4 +1,5 @@
 // "Replace with dot call" "true"
+// LANGUAGE_VERSION: 1.6
 // SHOULD_BE_AVAILABLE_AFTER_EXECUTION
 // Note: quick fix is available after the execution due to a separate warning (SAFE_CALL_WILL_CHANGE_NULLABILITY)
 class Foo(val bar: Bar)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after
index ec2ce7a7ba59..09e167550dfa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.fir.kt.after
@@ -16,4 +16,4 @@ class Test : X, a.b.c.Y(), Z {
     override fun foo() {
         super<Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt
index b739190db93b..98b959582fe2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt
@@ -16,4 +16,4 @@ class Test : X, a.b.c.Y(), Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt.after
index 5cb17ba018e6..6d9fe0ddeaa1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperType.kt.after
@@ -16,4 +16,4 @@ class Test : X, a.b.c.Y(), Z {
     override fun foo() {
         super<a.b.c.Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after
index a86d0ccebd5b..6dd4c0c438ae 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.fir.kt.after
@@ -14,4 +14,4 @@ class Test : (@Suppress("foo") a.b.c.X)(), Z {
     override fun foo() {
         super<X>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt
index b6c03b66bf5c..98a6f36095c9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt
@@ -14,4 +14,4 @@ class Test : (@Suppress("foo") a.b.c.X)(), Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt.after
index 1cda8c8a4e26..899ff95739f4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasAnnotations.kt.after
@@ -14,4 +14,4 @@ class Test : (@Suppress("foo") a.b.c.X)(), Z {
     override fun foo() {
         super<a.b.c.X>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after
index 89ac63370f64..23aad436add2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.fir.kt.after
@@ -16,4 +16,4 @@ class Test : a.b.c.Y<Int>(), X, Z {
     override fun foo() {
         super<Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt
index 93573c53df1e..3a6e5590819c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt
@@ -16,4 +16,4 @@ class Test : a.b.c.Y<Int>(), X, Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt.after
index 3155e3d193ac..38d9a4ff0ab6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/fullyQualifiedSuperTypeHasTypeArguments.kt.after
@@ -16,4 +16,4 @@ class Test : a.b.c.Y<Int>(), X, Z {
     override fun foo() {
         super<a.b.c.Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt
index e0731cb72507..b2ea408fa193 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt
@@ -15,4 +15,4 @@ class Test : X, Y(), Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt.after
index 1327cd2458d5..ba0f66068a0f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/function.kt.after
@@ -15,4 +15,4 @@ class Test : X, Y(), Z {
     override fun foo() {
         super<Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt
index 6e9b37a0d0a2..86161d622bf0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt
@@ -14,4 +14,4 @@ interface Z {
 class Test : X, Z, Y() {
     override val bar: Int
         get() = <caret>super.bar
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt.after
index ba287a6b5069..c5c64cdca268 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/property.kt.after
@@ -14,4 +14,4 @@ interface Z {
 class Test : X, Z, Y() {
     override val bar: Int
         get() = super<Z>.bar
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt
index c776432d9fd1..772bb0e91ed2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt
@@ -11,4 +11,4 @@ class Test : (@Suppress("foo") X)(), Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt.after
index 61d469d1f895..34400afb358f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasAnnotations.kt.after
@@ -11,4 +11,4 @@ class Test : (@Suppress("foo") X)(), Z {
     override fun foo() {
         super<X>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt
index ce1c2914d588..adc4444ab3bb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt
@@ -13,4 +13,4 @@ class Test : Y<Int>(), X, Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt.after
index fdd554371d45..7293cfc516da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeHasTypeArguments.kt.after
@@ -13,4 +13,4 @@ class Test : Y<Int>(), X, Z {
     override fun foo() {
         super<Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt
index b438e8ee8749..28ac1b4265a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt
@@ -15,4 +15,4 @@ class Test : X, Y(), Z {
     override fun foo() {
         <caret>super.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt.after
index 7a314211eabb..247465577344 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/specifySuperType/superTypeIsExtendedByOtherSuperType.kt.after
@@ -15,4 +15,4 @@ class Test : X, Y(), Z {
     override fun foo() {
         super<Y>.foo()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt
index 3278e508844e..4b336d56ef65 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt
@@ -1,4 +1,5 @@
 // "Surround with null check" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'false' branch or 'else' branch instead
 
 fun foo(arg: Int?, flag: Boolean) {
     when (flag) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt.after
index 2e618d331b71..9b5c2d414600 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/surroundWithNullCheck/unsafeCallInsideWhen.kt.after
@@ -1,4 +1,5 @@
 // "Surround with null check" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'false' branch or 'else' branch instead
 
 fun foo(arg: Int?, flag: Boolean) {
     when (flag) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test
new file mode 100644
index 000000000000..a268152d7094
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/definitelyNonNullableTypes/changeParameterTypeIsDisabledWhenDnnFeatureIsOff.test
@@ -0,0 +1,18 @@
+// FILE: first.before.kt
+// "Change parameter 'value' type of primary constructor of class 'Derived' to 'T & Any'" "false"
+// LANGUAGE_VERSION: 1.6
+// COMPILER_ARGUMENTS: -Xenhance-type-parameter-types-to-def-not-null
+// ERROR: Type mismatch: inferred type is T but T & Any was expected
+// ACTION: Add 'Any' as upper bound for T to make it non-nullable
+// ACTION: Add names in comment to call arguments
+// ACTION: Add non-null asserted (!!) call
+// ACTION: Cast expression 'value' to 'T & Any'
+
+class Derived<T>(value: T) : Base<T>(<caret>value) {}
+
+// FILE: Base.java
+import org.jetbrains.annotations.NotNull;
+
+public class Base<T> {
+    public Base(@NotNull T value) {}
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
index f40fbf7a72a6..4ab6a7b73b52 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/dontChangeOverriddenPropertyTypeToErrorType.kt
@@ -3,7 +3,7 @@
 // ACTION: Change type of base property 'A.x' to '(Int) -> Int'
 // ACTION: Go To Super Property
 // ACTION: Introduce import alias
-// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (String) -> [ERROR : Ay] defined in A'
+// ERROR: Type of 'x' is not a subtype of the overridden property 'public abstract val x: (String) -> [Error type: Unresolved type for Ay] defined in A'
 // ERROR: Unresolved reference: Ay
 interface A {
     val x: (String) -> Ay
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
index 422234164e63..0f0a2ff97687 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
@@ -7,7 +7,7 @@
 // ACTION: Enable a trailing comma by default in the formatter
 // ACTION: Remove explicit lambda parameter types (may break code)
 // ACTION: Create type parameter 'NoSuchType' in function 'foo'
-// ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> Int but Int was expected
+// ERROR: Type mismatch: inferred type is ([Error type: Unresolved type for NoSuchType]) -> Int but Int was expected
 // ERROR: Unresolved reference: NoSuchType
 
 fun foo(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt
new file mode 100644
index 000000000000..def09dd34164
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt
@@ -0,0 +1,6 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    while (true) {
+        x ?: when<caret> { true -> break }
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt.after
new file mode 100644
index 000000000000..c886fc25f118
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchBooleanWarning.kt.after
@@ -0,0 +1,8 @@
+// "Add else branch" "true"
+fun foo(x: String?) {
+    while (true) {
+        x ?: when { true -> break
+            else -> {<caret>}
+        }
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt
index b8a23abd6116..732d403cc3e4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt
@@ -7,4 +7,3 @@ fun use(c: Color) {
 }
 
 fun red() {}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt.after
index 674cdaba54d6..3668fe145994 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchEnumStatement.kt.after
@@ -8,4 +8,3 @@ fun use(c: Color) {
 }
 
 fun red() {}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt
index 7c46aac1def8..aca0de95fa58 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt
@@ -10,4 +10,3 @@ fun test(base: Base) {
         is Base.A -> ""
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt.after
index 6ad612c990c0..e7da91c017a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealed.kt.after
@@ -11,4 +11,3 @@ fun test(base: Base) {
         else -> {<caret>}
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt
new file mode 100644
index 000000000000..3a75c97a8962
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt
@@ -0,0 +1,12 @@
+// "Add else branch" "true"
+sealed class Base {
+    class A : Base()
+    class B : Base()
+    class C : Base()
+}
+
+fun test(base: Base, x: String?) {
+    x ?: when<caret> (base) {
+        is Base.A -> return
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt.after
new file mode 100644
index 000000000000..de3628a203a0
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addElseBranchSealedWarning.kt.after
@@ -0,0 +1,13 @@
+// "Add else branch" "true"
+sealed class Base {
+    class A : Base()
+    class B : Base()
+    class C : Base()
+}
+
+fun test(base: Base, x: String?) {
+    x ?: when (base) {
+        is Base.A -> return
+        else -> {<caret>}
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.after.kt
index 824f91d9456e..759876c96880 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.after.kt
@@ -1,4 +1,5 @@
 // "Add remaining branches" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'RED', 'GREEN', 'BLUE' branches or 'else' branch instead
 
 package u
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.before.Main.kt
index 2938c0cf3400..0145754470ec 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackage.before.Main.kt
@@ -1,4 +1,5 @@
 // "Add remaining branches" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'RED', 'GREEN', 'BLUE' branches or 'else' branch instead
 
 package u
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.after.kt
index 68770b141d19..619d5f306ac2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.after.kt
@@ -1,4 +1,5 @@
 // "Add remaining branches with * import" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'RED', 'GREEN', 'BLUE' branches or 'else' branch instead
 
 package u
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.before.Main.kt
index 74386e7636db..73ef8b7e85c4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesAnotherPackageAll.before.Main.kt
@@ -1,4 +1,5 @@
 // "Add remaining branches with * import" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'RED', 'GREEN', 'BLUE' branches or 'else' branch instead
 
 package u
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt
index 91629ae019d2..cefde7f5ded9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt
@@ -10,4 +10,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt.after
index 14743b8decd1..e75492e0ffcf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport1.kt.after
@@ -15,4 +15,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt
index a2f011058fa9..e72ae5f241e0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt
@@ -13,4 +13,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt.after
index 2ddedeb682ee..434c7c8dcc3b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport2.kt.after
@@ -14,4 +14,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt
index 6a6885b4d473..18aff34f34cb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt
@@ -23,4 +23,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt.after
index 808951c189eb..3232e16e7a5c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumImport3.kt.after
@@ -26,4 +26,3 @@ class Test {
         }
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt
index f7716cb8b98a..ee6ebd049f81 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt
@@ -9,4 +9,3 @@ fun use(c: Color) {
 }
 
 fun red() {}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt.after
index b14572df4192..e473a6374c95 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesEnumStatement.kt.after
@@ -11,4 +11,3 @@ fun use(c: Color) {
 }
 
 fun red() {}
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.kt
index 4374336f3363..d03d3b249869 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesMissingRightParenthesis.kt
@@ -1,5 +1,6 @@
 // "Add remaining branches" "false"
 // WITH_RUNTIME
+// ERROR: 'when' expression must be exhaustive, add necessary 'is B' branch or 'else' branch instead
 
 sealed class A
 class B : A()
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt
index 8c7ac46ab04b..c2160d2ec5d6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt
@@ -14,4 +14,3 @@ fun test(v: Variant?) {
         Variant.Singleton -> "s"
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt.after
index 4d9e726079f4..6456b3bf9e5b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedStatement.kt.after
@@ -17,4 +17,3 @@ fun test(v: Variant?) {
         null -> TODO()
     }
 }
-/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt
new file mode 100644
index 000000000000..c31a915902ed
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt
@@ -0,0 +1,14 @@
+// "Add remaining branches" "true"
+// ERROR: Unresolved reference: TODO
+// ERROR: Unresolved reference: TODO
+sealed class Base {
+    class A : Base()
+    class B : Base()
+    class C : Base()
+}
+
+fun test(base: Base, x: String?) {
+    x ?: when<caret> (base) {
+        is Base.A -> return
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt.after
new file mode 100644
index 000000000000..c0f0ea91972f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/addRemainingBranchesSealedWarning.kt.after
@@ -0,0 +1,16 @@
+// "Add remaining branches" "true"
+// ERROR: Unresolved reference: TODO
+// ERROR: Unresolved reference: TODO
+sealed class Base {
+    class A : Base()
+    class B : Base()
+    class C : Base()
+}
+
+fun test(base: Base, x: String?) {
+    x ?: when<caret> (base) {
+        is Base.A -> return
+        is Base.B -> TODO()
+        is Base.C -> TODO()
+    }
+}
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
index a2bf944c8671..ad114931bd9d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt
@@ -8,4 +8,6 @@ fun main() {
         <caret>null, 1 -> println(1)
         else -> println(0)
     }
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
index 9161e39ed449..081fe328d993 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/when/removeRedundantCondition.kt.after
@@ -8,4 +8,6 @@ fun main() {
         1 -> println(1)
         else -> println(0)
     }
-}
\ No newline at end of file
+}
+
+/* IGNORE_FIR */
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt
new file mode 100644
index 000000000000..635d943f22e4
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt
@@ -0,0 +1,11 @@
+// "Wrap expression in parentheses" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'true', 'false' branches or 'else' branch instead
+interface A {
+    operator fun contains(other: A): Boolean
+}
+
+fun test(x: A, b: Boolean) {
+    when (b) {
+        x in x<caret> -> {}
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt.after
new file mode 100644
index 000000000000..140717982a2c
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWhenExpressionInParentheses/logicalExpressionInWhen.kt.after
@@ -0,0 +1,11 @@
+// "Wrap expression in parentheses" "true"
+// ERROR: 'when' expression must be exhaustive, add necessary 'true', 'false' branches or 'else' branch instead
+interface A {
+    operator fun contains(other: A): Boolean
+}
+
+fun test(x: A, b: Boolean) {
+    when (b) {
+        (x in x) -> {}
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt
index 8bd17e4cb417..102a5c05c7af 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt
@@ -1,4 +1,6 @@
 // "Migrate unsupported yield syntax" "true"
+// LANGUAGE_VERSION: 1.6
+
 object yield {}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt.after
index c0291f4d9a44..58c496980462 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldAsSimpleName.kt.after
@@ -1,4 +1,6 @@
 // "Migrate unsupported yield syntax" "true"
+// LANGUAGE_VERSION: 1.6
+
 object yield {}
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt
index fb4ef9eff8ff..f27c6160c8f8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt
@@ -1,4 +1,6 @@
 // "Migrate unsupported yield syntax" "true"
+// LANGUAGE_VERSION: 1.6
+
 object yield {
     operator fun invoke(f: () -> Unit) = f()
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt.after
index 241522ed95f1..48c9f62c55e8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/yieldUnsupported/yieldBeforeLambda.kt.after
@@ -1,4 +1,6 @@
 // "Migrate unsupported yield syntax" "true"
+// LANGUAGE_VERSION: 1.6
+
 object yield {
     operator fun invoke(f: () -> Unit) = f()
 }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
index 15a773a1bc81..c0ea5ee635c3 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.`<anonymous>`
 // PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
 fun test() {
     J.getMap().filter { <selection>it.key</selection> }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
index 33c1a1a840e5..8a6694281b68 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!> defined in test.`<anonymous>`
 // PARAM_TYPES: kotlin.collections.Map.Entry<kotlin.Boolean!, kotlin.Boolean!>
 fun test() {
     J.getMap().filter { b(it) }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt
index 02b002ee0a06..db99368b12bd 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val t: <no name provided> defined in foo
+// PARAM_DESCRIPTOR: val t: `<no name provided>` defined in foo
 // PARAM_TYPES: T
 interface T {
     fun test() {}
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt.after
index 07b3caa0493b..8b5f26bef15e 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/delegatingFunction.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val t: <no name provided> defined in foo
+// PARAM_DESCRIPTOR: val t: `<no name provided>` defined in foo
 // PARAM_TYPES: T
 interface T {
     fun test() {}
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt
index 20ce49dfcd1f..88f31edf86b8 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt
@@ -2,7 +2,7 @@
 // PARAM_TYPES: kotlin.String
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
-// PARAM_DESCRIPTOR: local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo.<anonymous>.<anonymous>, local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo.<anonymous>, local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo
+// PARAM_DESCRIPTOR: local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo.`<anonymous>`.`<anonymous>`, local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo.`<anonymous>`, local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo
 class Foo {
     fun foo() {
         block("a") a@ {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt.after
index 8ac765b02f6b..aa6f16fc02f4 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/basic/sameParameterNames.kt.after
@@ -2,7 +2,7 @@
 // PARAM_TYPES: kotlin.String
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
 // PARAM_TYPES: kotlin.String, kotlin.Comparable<kotlin.String>, kotlin.CharSequence, java.io.Serializable, kotlin.Any
-// PARAM_DESCRIPTOR: local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo.<anonymous>.<anonymous>, local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo.<anonymous>, local final fun kotlin.String.<anonymous>(): kotlin.Unit defined in Foo.foo
+// PARAM_DESCRIPTOR: local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo.`<anonymous>`.`<anonymous>`, local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo.`<anonymous>`, local final fun kotlin.String.`<anonymous>`(): kotlin.Unit defined in Foo.foo
 class Foo {
     fun foo() {
         block("a") a@ {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt
index bf7327e7191d..c7545ce8bfc6 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(a: Int): Int {
     a.let {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after
index 38dcec62a52d..0b238d4a06c7 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn1.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(a: Int): Int {
     a.let {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt
index d5c07310ed2d..5588cdedf47c 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(a: Int): Int {
     a.let {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after
index 6a574cb7ef74..697e2941cf32 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/labeledAndUnlabeledReturn2.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(a: Int): Int {
     a.let {
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt
index 3d7a3319e990..0990abc3a5a1 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(): Int {
     1.let { <selection>return it + 1</selection> }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after
index 6145abeb1234..375bf7d41510 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturn.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(): Int {
     1.let { return i(it) }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt
index a8f0354e55eb..ec233c8eb3ee 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(): Int {
     1.let { <selection>return@foo it + 1</selection> }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after
index 6bdee1d901c0..dd10f4df92c2 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/definiteReturns/nonLocalReturnWithLabel.kt.after
@@ -1,5 +1,5 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 // PARAM_TYPES: kotlin.Int
 fun foo(): Int {
     1.let { return@foo i(it) }
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt
index e6c4f0d80252..28bd0ef54ac6 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.<init>
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.`<init>`
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.`<init>`
 interface T
 
 class A(a: Int, b: Int): T
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
index f62a23d9f1c4..c3ab7bff0a73 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.<init>
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.`<init>`
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.`<init>`
 interface T
 
 class A(a: Int, b: Int): T
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt
index 000165210886..0dcfa8e7229b 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: T
-// PARAM_DESCRIPTOR: value-parameter t: T defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter t: T defined in B.`<init>`
 interface T
 
 class A(a: Int, b: Int): T
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
index be4cdca68f5a..dae6b31dd034 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: T
-// PARAM_DESCRIPTOR: value-parameter t: T defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter t: T defined in B.`<init>`
 interface T
 
 class A(a: Int, b: Int): T
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt
index 170f1ab31114..3797d01bcf0a 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt
@@ -1,7 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.<init>
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.`<init>`
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.`<init>`
 open class A(a: Int, b: Int)
 
 class B(a: Int, b: Int): A(<selection>a + b</selection>, a - b)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
index be37f865b3ba..9cec55b8615c 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after
@@ -1,7 +1,7 @@
 // PARAM_TYPES: kotlin.Int
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.<init>
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in B.`<init>`
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in B.`<init>`
 open class A(a: Int, b: Int)
 
 class B(a: Int, b: Int): A(i(a, b), a - b)
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt
index 0df716da1344..818892cd9f90 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     init {
         println(<selection>a + b</selection> - 1)
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
index d1141250dbc3..a280ec48fa8d 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     init {
         println(i(b) - 1)
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt
index 4e57dc833e32..4b4482121d14 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     init {
         println({ <selection>a + b</selection> - 1 }.invoke())
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
index f14a8c1162e9..08d55c39f94b 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     init {
         println({ i(b) - 1 }.invoke())
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt
index f835f25992da..5479e5831ede 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt
@@ -1,4 +1,4 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.`<init>`
 val n = 1
 class A(val a: Int, val b: Int = <selection>a + n</selection>)
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
index 1c9ba9d450a9..9f6c45c41c8e 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.`<init>`
 val n = 1
 class A(val a: Int, val b: Int = i(a))
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt
index 61cf20e11cf6..4446f98df770 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt
@@ -1,4 +1,4 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.`<init>`
 val n = 1
 class A(val a: Int, val b: Int = { <selection>a + n</selection> }.invoke())
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
index cfeab42f9d4b..7911d2db614e 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter a: kotlin.Int defined in A.`<init>`
 val n = 1
 class A(val a: Int, val b: Int = { i(a) }.invoke())
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt
index 41ef4fc443ff..edf3049df574 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     val foo = <selection>a + b</selection> - 1
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
index 5e52be4576bc..a9902a782f81 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     val foo = i(b) - 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt
index 3cd6766bcd14..f55720eb4446 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     val foo = { <selection>a + b</selection> - 1 }.invoke()
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
index bb5736e33673..030d83daa6e6 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.<init>
+// PARAM_DESCRIPTOR: value-parameter b: kotlin.Int defined in A.`<init>`
 class A(val a: Int, b: Int) {
     val foo = { i(b) - 1 }.invoke()
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt.conflicts b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt.conflicts
index 440cc5151f48..f02157b936e0 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt.conflicts
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/cantLiftAnonymousToSupertype.kt.conflicts
@@ -1 +1 @@
-Cannot extract method since following types are not denotable in the target scope:  &lt;no name provided&gt;
\ No newline at end of file
+Cannot extract method since following types are not denotable in the target scope:  `&lt;no name provided&gt;`
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt
index fe58c289548d..f0802b04bc82 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: local final class <no name provided> defined in x
+// PARAM_DESCRIPTOR: local final class `<no name provided>` defined in x
 // PARAM_TYPES: kotlin.Any
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt.after
index 87067bb7987d..ecae4ef33495 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype1.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: local final class <no name provided> defined in x
+// PARAM_DESCRIPTOR: local final class `<no name provided>` defined in x
 // PARAM_TYPES: kotlin.Any
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt
index e273e266daaf..91b8350269ce 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val x: <no name provided> defined in test
+// PARAM_DESCRIPTOR: val x: `<no name provided>` defined in test
 // PARAM_TYPES: A
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt.after
index 083b30f0d889..301eeef91482 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/candidateTypes/liftAnonymousToSupertype2.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: val x: <no name provided> defined in test
+// PARAM_DESCRIPTOR: val x: `<no name provided>` defined in test
 // PARAM_TYPES: A
 // WITH_RUNTIME
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt
index 28e591ff0722..03f95452f481 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
index 9985b9527786..d6688d9911c7 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt
index 2fdf14c4eb95..510e2fc63244 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<kotlin.Int>
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Array<kotlin.Int> defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Array<kotlin.Int> defined in foo.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
index b9659fe4b8d5..f5bf6892dfa5 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Array<kotlin.Int>
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Array<kotlin.Int> defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Array<kotlin.Int> defined in foo.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt
index 2820d00a5f6a..607cec1314f5 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
index 21b2d570c5ce..1abe4eca5704 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after
@@ -1,5 +1,5 @@
 // PARAM_TYPES: kotlin.Int
-// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.<anonymous>
+// PARAM_DESCRIPTOR: value-parameter it: kotlin.Int defined in foo.`<anonymous>`
 fun <T> Array<T>.check(f: (T) -> Boolean): Boolean = false
 
 // SIBLING:
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt
index f399cf51c51c..5adc78e85661 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: local final fun Builder.<anonymous>(): kotlin.Unit defined in test.<anonymous>
+// PARAM_DESCRIPTOR: local final fun Builder.`<anonymous>`(): kotlin.Unit defined in test.`<anonymous>`
 // PARAM_TYPES: Builder
 
 class Builder()
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt.after
index 7fb61772d9aa..b5ea5901d679 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/misc/extensionLambda.kt.after
@@ -1,4 +1,4 @@
-// PARAM_DESCRIPTOR: local final fun Builder.<anonymous>(): kotlin.Unit defined in test.<anonymous>
+// PARAM_DESCRIPTOR: local final fun Builder.`<anonymous>`(): kotlin.Unit defined in test.`<anonymous>`
 // PARAM_TYPES: Builder
 
 class Builder()
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt.conflicts b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt.conflicts
index 440cc5151f48..f02157b936e0 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt.conflicts
+++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObjectWithCall.kt.conflicts
@@ -1 +1 @@
-Cannot extract method since following types are not denotable in the target scope:  &lt;no name provided&gt;
\ No newline at end of file
+Cannot extract method since following types are not denotable in the target scope:  `&lt;no name provided&gt;`
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/Sequence.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/Sequence.kt.after
index fe66f6083ddb..c74d73d93afe 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/Sequence.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/Sequence.kt.after
@@ -6,8 +6,8 @@ fun <T> mySeq(f: MySeq<T>.() -> Unit): MySeq<T> = null!!
 
 class Test {
     fun repro() = mySeq<Int> {
-        mySeq<Double> {
-            yield(1.0)
+        mySeq {
+            this.yield(1.0)
         }
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/UnitReturnType4.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/UnitReturnType4.kt.after
index 7b6beaf70139..e0bcf9a5e0ca 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/UnitReturnType4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/inline/namedFunction/UnitReturnType4.kt.after
@@ -8,5 +8,6 @@ abstract class A {
 class B : A() {
     override fun a() = doIt {
         1.let { it.let { it.let { it.let { it?.doDo() } } } }
+        Unit
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt
index b645341fcbf2..e51d7670c48a 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt.after
index 60f7daf0ee64..6e049b7e6ac2 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerCompareTo.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt
index d94c0bafe547..aff57b913b1d 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt.after
index 535da83b1fd3..713bc106356a 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/integerEquals.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt
index b8f50d24078f..f321ff5f1e0f 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt.after
index e3f4c32e1469..4d0dbfb7905b 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringCompareTo.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt
index 17f8994a4885..a06ea54bad32 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt.after
index 3e8ba282eddd..608885dfc3f5 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt.after
+++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceConstant/binaryExpression/stringEquals.kt.after
@@ -1,3 +1,4 @@
+// LANGUAGE_VERSION: 1.6
 // EXTRACTION_TARGET: property with initializer
 val a = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInBaseConstructor.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInBaseConstructor.kt
index b2ea7410131e..8bf628d7d963 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInBaseConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInBaseConstructor.kt
@@ -16,10 +16,10 @@ class C : B(object : A {
 //value-parameter x: kotlin.Int defined in test.A.get
 //public open class B defined in test
 //public constructor B(a: test.A) defined in test.B
-//value-parameter a: test.A defined in test.B.<init>
+//value-parameter a: test.A defined in test.B.`<init>`
 //public final class C : test.B defined in test
 //public constructor C() defined in test.C
-//local final class <no name provided> : test.A defined in test.C.<init>
-//public constructor <no name provided>() defined in test.C.<init>.<no name provided>
-//public open fun get(x: kotlin.Int): kotlin.Unit defined in test.C.<init>.<no name provided>
-//value-parameter x: kotlin.Int defined in test.C.<init>.<no name provided>.get
\ No newline at end of file
+//local final class `<no name provided>` : test.A defined in test.C.`<init>`
+//public constructor `<no name provided>`() defined in test.C.`<init>`.`<no name provided>`
+//public open fun get(x: kotlin.Int): kotlin.Unit defined in test.C.`<init>`.`<no name provided>`
+//value-parameter x: kotlin.Int defined in test.C.`<init>`.`<no name provided>`.get
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt
index 9527b5b990ef..578891e8f37d 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt
@@ -15,6 +15,6 @@ class MyClass() {
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass() defined in test.MyClass
-//val a: test.MyClass.<init>.<no name provided> defined in test.MyClass.<init>
-//local final class <no name provided> : test.A defined in test.MyClass.<init>
-//public constructor <no name provided>() defined in test.MyClass.<init>.<no name provided>
\ No newline at end of file
+//val a: test.MyClass.`<init>`.`<no name provided>` defined in test.MyClass.`<init>`
+//local final class `<no name provided>` : test.A defined in test.MyClass.`<init>`
+//public constructor `<no name provided>`() defined in test.MyClass.`<init>`.`<no name provided>`
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt
index 4c9cb25da9ac..167d8e761505 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt
@@ -13,6 +13,6 @@ class MyClass(
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass(a: test.A = ...) defined in test.MyClass
-//value-parameter a: test.A = ... defined in test.MyClass.<init>
-//local final class <no name provided> : test.A defined in test.MyClass.<init>
-//public constructor <no name provided>() defined in test.MyClass.<init>.<no name provided>
\ No newline at end of file
+//value-parameter a: test.A = ... defined in test.MyClass.`<init>`
+//local final class `<no name provided>` : test.A defined in test.MyClass.`<init>`
+//public constructor `<no name provided>`() defined in test.MyClass.`<init>`.`<no name provided>`
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/functionLiteralInBaseConstructor.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/functionLiteralInBaseConstructor.kt
index 3b86d19dae96..8a5d23f8a137 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/functionLiteralInBaseConstructor.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/functionLiteralInBaseConstructor.kt
@@ -9,6 +9,6 @@ class C : B({
 //package test
 //public open class B defined in test
 //public constructor B(foo: () -> kotlin.Unit) defined in test.B
-//value-parameter foo: () -> kotlin.Unit defined in test.B.<init>
+//value-parameter foo: () -> kotlin.Unit defined in test.B.`<init>`
 //public final class C : test.B defined in test
 //public constructor C() defined in test.C
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt
index 4134efccd11c..fcdc3739c4db 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt
@@ -15,5 +15,5 @@ class MyClass() {
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass() defined in test.MyClass
-//local final class B : test.A defined in test.MyClass.<init>
-//public constructor B() defined in test.MyClass.<init>.B
\ No newline at end of file
+//local final class B : test.A defined in test.MyClass.`<init>`
+//public constructor B() defined in test.MyClass.`<init>`.B
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt
index 49ecad4cae26..2e0afee7f898 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt
@@ -17,6 +17,6 @@ class MyClass(
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass(a: test.A = ...) defined in test.MyClass
-//value-parameter a: test.A = ... defined in test.MyClass.<init>
-//local final class B : test.A defined in test.MyClass.<init>.<anonymous>
-//public constructor B() defined in test.MyClass.<init>.<anonymous>.B
\ No newline at end of file
+//value-parameter a: test.A = ... defined in test.MyClass.`<init>`
+//local final class B : test.A defined in test.MyClass.`<init>`.`<anonymous>`
+//public constructor B() defined in test.MyClass.`<init>`.`<anonymous>`.B
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt
index d23bd3495140..83a3c5de7d78 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt
@@ -15,5 +15,5 @@ class MyClass() {
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass() defined in test.MyClass
-//local object O : test.A defined in test.MyClass.<init>
-//private constructor O() defined in test.MyClass.<init>.O
\ No newline at end of file
+//local object O : test.A defined in test.MyClass.`<init>`
+//private constructor O() defined in test.MyClass.`<init>`.O
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt
index c2ff3f3335d1..8deeb9027ee1 100644
--- a/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt
+++ b/plugins/kotlin/idea/tests/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt
@@ -17,6 +17,6 @@ class MyClass(
 //public constructor A() defined in test.A
 //public final class MyClass defined in test
 //public constructor MyClass(a: test.A = ...) defined in test.MyClass
-//value-parameter a: test.A = ... defined in test.MyClass.<init>
-//local object O : test.A defined in test.MyClass.<init>.<anonymous>
-//private constructor O() defined in test.MyClass.<init>.<anonymous>.O
\ No newline at end of file
+//value-parameter a: test.A = ... defined in test.MyClass.`<init>`
+//local object O : test.A defined in test.MyClass.`<init>`.`<anonymous>`
+//private constructor O() defined in test.MyClass.`<init>`.`<anonymous>`.O
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypePrimaryConstructor.kt b/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypePrimaryConstructor.kt
new file mode 100644
index 000000000000..5e7136fb321e
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypePrimaryConstructor.kt
@@ -0,0 +1,5 @@
+class A(i: Int)
+
+class B: <caret>A(42)
+
+// REF: (in A).A(Int)
diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypeSecondaryConstructor.kt b/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypeSecondaryConstructor.kt
new file mode 100644
index 000000000000..340393d2ae7f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/resolve/references/SuperTypeSecondaryConstructor.kt
@@ -0,0 +1,7 @@
+class A {
+    constructor()
+}
+
+class B: <caret>A()
+
+// REF: (in A).A()
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt
new file mode 100644
index 000000000000..9b55e21b4c1f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class GenericParam
+
+class Generic<T, TT>
+
+<selection>fun foo(t: test.Generic<test.GenericParam>) {}</selection>
diff --git a/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt.after b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt.after
new file mode 100644
index 000000000000..8b0cfd10473f
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/shortenRefsFir/types/ParameterTypeGenericTypes_missingTypeArgumentError.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class GenericParam
+
+class Generic<T, TT>
+
+fun foo(t: Generic<GenericParam>) {}
diff --git a/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt b/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt
index 9050310d5942..92bef326fffd 100644
--- a/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt
+++ b/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt
@@ -1,3 +1,5 @@
+// LANGUAGE_VERSION: 1.6
+
 fun foo(): Int {
 
     fun f() {}
diff --git a/plugins/kotlin/intellij.kotlin.plugin.community.main.iml b/plugins/kotlin/intellij.kotlin.plugin.community.main.iml
index 59ce72d1c684..25a0bf31790d 100644
--- a/plugins/kotlin/intellij.kotlin.plugin.community.main.iml
+++ b/plugins/kotlin/intellij.kotlin.plugin.community.main.iml
@@ -40,8 +40,6 @@
     <orderEntry type="module" module-name="kotlin.j2k.new" exported="" />
     <orderEntry type="module" module-name="kotlin.j2k.old" exported="" />
     <orderEntry type="module" module-name="kotlin.j2k.services" exported="" />
-    <orderEntry type="module" module-name="kotlin.jps-common" exported="" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" exported="" />
     <orderEntry type="module" module-name="kotlin.i18n" exported="" />
     <orderEntry type="module" module-name="kotlin.jvm" exported="" />
     <orderEntry type="module" module-name="kotlin.jvm-debugger.core" exported="" />
@@ -77,12 +75,14 @@
     <orderEntry type="module" module-name="kotlin.project-wizard.gradle" exported="" />
     <orderEntry type="module" module-name="kotlin.scripting-support" exported="" />
     <orderEntry type="module" module-name="kotlin.project-model" exported="" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" exported="" />
     <orderEntry type="module" module-name="kotlin.jvm-run-configurations" exported="" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.lombok.gradle" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.lombok.maven" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
+    <orderEntry type="library" exported="" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-common" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-scripting-compiler" level="project" />
@@ -97,7 +97,7 @@
     <orderEntry type="library" exported="" name="kotlinx-coroutines-jdk8" level="project" />
     <orderEntry type="library" exported="" name="kotlinx-collections-immutable-jvm" level="project" />
     <orderEntry type="library" exported="" name="kotlinc.kotlin-reflect" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="javaslang" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="completion-ranking-kotlin" level="project" />
     <orderEntry type="module" module-name="intellij.markdown" scope="RUNTIME" />
diff --git a/plugins/kotlin/j2k/new/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt b/plugins/kotlin/j2k/new/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
index 83337311410a..7e4f17b92eab 100644
--- a/plugins/kotlin/j2k/new/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
+++ b/plugins/kotlin/j2k/new/src/org/jetbrains/kotlin/nj2k/JavaToJKTreeBuilder.kt
@@ -17,12 +17,12 @@ import com.intellij.psi.impl.source.tree.java.PsiNewExpressionImpl
 import com.intellij.psi.infos.MethodCandidateInfo
 import com.intellij.psi.javadoc.PsiDocComment
 import com.intellij.psi.tree.IElementType
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
 import org.jetbrains.kotlin.asJava.elements.KtLightField
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.j2k.content
 import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName
 import org.jetbrains.kotlin.j2k.ReferenceSearcher
diff --git a/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml b/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
deleted file mode 100644
index 21ffd21e279a..000000000000
--- a/plugins/kotlin/jps/jps-common/kotlin.jps-common.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsContentProspector.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsContentProspector.kt
deleted file mode 100644
index 92b01d4659c5..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsContentProspector.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-import org.jetbrains.kotlin.cli.common.arguments.Argument
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
-import org.jetbrains.kotlin.cli.common.arguments.InternalArgument
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import kotlin.reflect.KClass
-import kotlin.reflect.KProperty1
-import kotlin.reflect.KType
-import kotlin.reflect.full.memberProperties
-
-object CompilerArgumentsContentProspector {
-    private val argumentPropertiesCache: MutableMap<KClass<out CommonToolArguments>, Collection<KProperty1<out CommonToolArguments, *>>> =
-        mutableMapOf()
-
-    private val flagArgumentPropertiesCache: MutableMap<KClass<out CommonToolArguments>, Collection<KProperty1<out CommonToolArguments, Boolean>>> =
-        mutableMapOf()
-
-    private val stringArgumentPropertiesCache: MutableMap<KClass<out CommonToolArguments>, Collection<KProperty1<out CommonToolArguments, String?>>> =
-        mutableMapOf()
-
-    private val arrayArgumentPropertiesCache: MutableMap<KClass<out CommonToolArguments>, Collection<KProperty1<out CommonToolArguments, Array<String>?>>> =
-        mutableMapOf()
-
-    private fun getCompilerArgumentsProperties(kClass: KClass<out CommonToolArguments>) = argumentPropertiesCache.getOrPut(kClass) {
-        kClass.memberProperties.filter { prop -> prop.annotations.any { it is Argument } }
-    }
-
-    private inline fun <reified R : Any?> Collection<KProperty1<out CommonToolArguments, *>>.filterByReturnType(predicate: (KType?) -> Boolean) =
-        filter { predicate(it.returnType) }.mapNotNull { it.safeAs<KProperty1<CommonToolArguments, R>>() }
-
-    fun getFlagCompilerArgumentProperties(kClass: KClass<out CommonToolArguments>): Collection<KProperty1<out CommonToolArguments, Boolean>> =
-        flagArgumentPropertiesCache.getOrPut(kClass) { getCompilerArgumentsProperties(kClass).filterByReturnType { it?.classifier == Boolean::class } }
-
-    fun getStringCompilerArgumentProperties(kClass: KClass<out CommonToolArguments>): Collection<KProperty1<out CommonToolArguments, String?>> =
-        stringArgumentPropertiesCache.getOrPut(kClass) { getCompilerArgumentsProperties(kClass).filterByReturnType { it?.classifier == String::class } }
-
-    fun getArrayCompilerArgumentProperties(kClass: KClass<out CommonToolArguments>): Collection<KProperty1<out CommonToolArguments, Array<String>?>> =
-        arrayArgumentPropertiesCache.getOrPut(kClass) { getCompilerArgumentsProperties(kClass).filterByReturnType { (it?.classifier as? KClass<*>)?.java?.isArray == true } }
-
-    val freeArgsProperty: KProperty1<in CommonToolArguments, List<String>>
-        get() = CommonToolArguments::freeArgs
-    val internalArgumentsProperty: KProperty1<in CommonToolArguments, List<InternalArgument>>
-        get() = CommonToolArguments::internalArguments
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsDeserializer.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsDeserializer.kt
deleted file mode 100644
index ad7f48c27167..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsDeserializer.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-import org.jdom.Element
-import org.jdom.Text
-import org.jetbrains.kotlin.cli.common.arguments.ArgumentParseErrors
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
-import org.jetbrains.kotlin.cli.common.arguments.InternalArgument
-import org.jetbrains.kotlin.cli.common.arguments.LanguageSettingsParser
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import java.io.File
-import kotlin.reflect.KMutableProperty1
-
-interface CompilerArgumentsDeserializer<T : CommonToolArguments> {
-    val compilerArguments: T
-    fun deserializeFrom(element: Element)
-}
-
-class CompilerArgumentsDeserializerV5<T : CommonToolArguments>(override val compilerArguments: T) : CompilerArgumentsDeserializer<T> {
-    override fun deserializeFrom(element: Element) {
-        val flagArgumentsByName = readFlagArguments(element)
-        val flagArgumentsPropertiesMap = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(compilerArguments::class)
-            .associateBy { it.name }
-        flagArgumentsByName.forEach { (name, value) ->
-            val mutableProp = flagArgumentsPropertiesMap[name].safeAs<KMutableProperty1<T, Boolean>>() ?: return@forEach
-            mutableProp.set(compilerArguments, value)
-        }
-
-        val stringArgumentsByName = readStringArguments(element)
-        val stringArgumentPropertiesMap = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(compilerArguments::class)
-            .associateBy { it.name }
-        stringArgumentsByName.forEach { (name, arg) ->
-            val mutableProp = stringArgumentPropertiesMap[name].safeAs<KMutableProperty1<T, String?>>() ?: return@forEach
-            mutableProp.set(compilerArguments, arg)
-        }
-        val arrayArgumentsByName = readArrayArguments(element)
-        val arrayArgumentPropertiesMap = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(compilerArguments::class)
-            .associateBy { it.name }
-        arrayArgumentsByName.forEach { (name, arr) ->
-            val mutableProp = arrayArgumentPropertiesMap[name].safeAs<KMutableProperty1<T, Array<String>?>>() ?: return@forEach
-            mutableProp.set(compilerArguments, arr)
-        }
-        val freeArgs = readElementsList(element, FREE_ARGS_ROOT_ELEMENTS_NAME, FREE_ARGS_ELEMENT_NAME)
-        CompilerArgumentsContentProspector.freeArgsProperty.also {
-            val mutableProp = it.safeAs<KMutableProperty1<T, List<String>>>() ?: return@also
-            mutableProp.set(compilerArguments, freeArgs)
-        }
-
-        val internalArguments = readElementsList(element, INTERNAL_ARGS_ROOT_ELEMENTS_NAME, INTERNAL_ARGS_ELEMENT_NAME)
-            .mapNotNull { parseInternalArgument(it) }
-        CompilerArgumentsContentProspector.internalArgumentsProperty.safeAs<KMutableProperty1<T, List<InternalArgument>>>()
-            ?.set(compilerArguments, internalArguments)
-    }
-
-    companion object {
-        private fun readElementConfigurable(element: Element, rootElementName: String, configurable: Element.() -> Unit) {
-            element.getChild(rootElementName)?.apply { configurable(this) }
-        }
-
-        private fun readStringArguments(element: Element): Map<String, String> = mutableMapOf<String, String>().also {
-            readElementConfigurable(element, STRING_ROOT_ELEMENTS_NAME) {
-                getChildren(STRING_ELEMENT_NAME).forEach { child ->
-                    val name = child.getAttribute(NAME_ATTR_NAME)?.value ?: return@forEach
-                    val arg = if (name == "classpath")
-                        readElementsList(child, ARGS_ATTR_NAME, ARG_ATTR_NAME).joinToString(File.pathSeparator)
-                    else child.getAttribute(ARG_ATTR_NAME)?.value ?: return@forEach
-                    it += name to arg
-                }
-            }
-        }
-
-        private fun readFlagArguments(element: Element): Map<String, Boolean> = mutableMapOf<String, Boolean>().also {
-            readElementConfigurable(element, FLAG_ROOT_ELEMENTS_NAME) {
-                getChildren(FLAG_ELEMENT_NAME).forEach { child ->
-                    val name = child.getAttribute(NAME_ATTR_NAME)?.value ?: return@forEach
-                    val arg = child.getAttribute(ARG_ATTR_NAME)?.booleanValue ?: return@forEach
-                    it += name to arg
-                }
-            }
-        }
-
-        private fun readElementsList(element: Element, rootElementName: String, elementName: String): List<String> =
-            mutableListOf<String>().also { list ->
-                readElementConfigurable(element, rootElementName) {
-                    val items = getChildren(elementName)
-                    if (items.isNotEmpty()) {
-                        items.mapNotNullTo(list) { (it.content.firstOrNull() as? Text)?.textTrim }
-                    } else {
-                        list += listOfNotNull((content.firstOrNull() as? Text)?.textTrim)
-                    }
-                }
-            }
-
-        private fun readArrayArguments(element: Element): Map<String, Array<String>> = mutableMapOf<String, Array<String>>().apply {
-            readElementConfigurable(element, ARRAY_ROOT_ELEMENTS_NAME) {
-                getChildren(ARRAY_ELEMENT_NAME).forEach { child ->
-                    val name = child.getAttribute(NAME_ATTR_NAME)?.value ?: return@forEach
-                    val array = readElementsList(child, ARGS_ATTR_NAME, ARG_ATTR_NAME).toTypedArray()
-                    this@apply += name to array
-                }
-            }
-        }
-
-        private fun parseInternalArgument(argument: String): InternalArgument? {
-            val parser = LanguageSettingsParser()
-            return parser.parseInternalArgument(argument, ArgumentParseErrors())
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsSerializer.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsSerializer.kt
deleted file mode 100644
index 7d8d73cc8d01..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/CompilerArgumentsSerializer.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-import org.jdom.Element
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
-import org.jetbrains.kotlin.config.restoreNormalOrdering
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import java.io.File
-import kotlin.reflect.KProperty1
-
-interface CompilerArgumentsSerializer<T : CommonToolArguments> {
-    val arguments: T
-    fun serializeTo(element: Element): Element
-}
-
-class CompilerArgumentsSerializerV5<T : CommonToolArguments>(override val arguments: T) : CompilerArgumentsSerializer<T> {
-
-    override fun serializeTo(element: Element): Element = Element(COMPILER_ARGUMENTS_ELEMENT_NAME).apply {
-        val newInstance = arguments::class.java.getConstructor().newInstance()
-        val flagArgumentsByName = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(arguments::class)
-            .mapNotNull { prop ->
-                prop.safeAs<KProperty1<T, Boolean>>()
-                    ?.takeIf { it.get(arguments) != it.get(newInstance) }
-                    ?.get(arguments)
-                    ?.let { prop.name to it }
-            }.toMap()
-        saveFlagArguments(this, flagArgumentsByName)
-
-        val stringArgumentsByName = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(arguments::class)
-            .mapNotNull { prop ->
-                prop.safeAs<KProperty1<T, String?>>()
-                    ?.takeIf { it.get(arguments) != it.get(newInstance) }
-                    ?.get(arguments)
-                    ?.let { prop.name to it }
-            }.toMap()
-        saveStringArguments(this, stringArgumentsByName)
-
-        val arrayArgumentsByName = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(arguments::class)
-            .mapNotNull { prop ->
-                prop.safeAs<KProperty1<T, Array<String>?>>()
-                    ?.takeIf { it.get(arguments)?.contentEquals(it.get(newInstance)) != true }
-                    ?.get(arguments)
-                    ?.let { prop.name to it }
-            }.toMap()
-        saveArrayArguments(this, arrayArgumentsByName)
-        val freeArgs = CompilerArgumentsContentProspector.freeArgsProperty.get(arguments)
-        saveElementsList(this, FREE_ARGS_ROOT_ELEMENTS_NAME, FREE_ARGS_ELEMENT_NAME, freeArgs)
-        val internalArguments = CompilerArgumentsContentProspector.internalArgumentsProperty.get(arguments).map { it.stringRepresentation }
-        saveElementsList(this, INTERNAL_ARGS_ROOT_ELEMENTS_NAME, INTERNAL_ARGS_ELEMENT_NAME, internalArguments)
-        restoreNormalOrdering(arguments)
-        element.addContent(this)
-    }
-
-    companion object {
-        private fun saveElementConfigurable(element: Element, rootElementName: String, configurable: Element.() -> Unit) {
-            element.addContent(Element(rootElementName).apply { configurable(this) })
-        }
-
-        private fun saveStringArguments(element: Element, argumentsByName: Map<String, String>) {
-            if (argumentsByName.isEmpty()) return
-            saveElementConfigurable(element, STRING_ROOT_ELEMENTS_NAME) {
-                argumentsByName.entries.forEach { (name, arg) ->
-                    Element(STRING_ELEMENT_NAME).also {
-                        it.setAttribute(NAME_ATTR_NAME, name)
-                        if (name == "classpath") {
-                            saveElementsList(it, ARGS_ATTR_NAME, ARG_ATTR_NAME, arg.split(File.pathSeparator))
-                        } else {
-                            it.setAttribute(ARG_ATTR_NAME, arg)
-                        }
-                        addContent(it)
-                    }
-                }
-            }
-        }
-
-        private fun saveFlagArguments(element: Element, argumentsByName: Map<String, Boolean>) {
-            if (argumentsByName.isEmpty()) return
-            saveElementConfigurable(element, FLAG_ROOT_ELEMENTS_NAME) {
-                argumentsByName.entries.forEach { (name, arg) ->
-                    Element(FLAG_ELEMENT_NAME).also {
-                        it.setAttribute(NAME_ATTR_NAME, name)
-                        it.setAttribute(ARG_ATTR_NAME, arg.toString())
-                        addContent(it)
-                    }
-                }
-            }
-        }
-
-        private fun saveElementsList(element: Element, rootElementName: String, elementName: String, elementList: List<String>) {
-            if (elementList.isEmpty()) return
-            saveElementConfigurable(element, rootElementName) {
-                val singleModule = elementList.singleOrNull()
-                if (singleModule != null) {
-                    addContent(singleModule)
-                } else {
-                    elementList.forEach { elementValue -> addContent(Element(elementName).also { it.addContent(elementValue) }) }
-                }
-            }
-        }
-
-        private fun saveArrayArguments(element: Element, arrayArgumentsByName: Map<String, Array<String>>) {
-            if (arrayArgumentsByName.isEmpty()) return
-            saveElementConfigurable(element, ARRAY_ROOT_ELEMENTS_NAME) {
-                arrayArgumentsByName.entries.forEach { (name, arg) ->
-                    Element(ARRAY_ELEMENT_NAME).also {
-                        it.setAttribute(NAME_ATTR_NAME, name)
-                        saveElementsList(it, ARGS_ATTR_NAME, ARG_ATTR_NAME, arg.toList())
-                        addContent(it)
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/serializationUtils.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/serializationUtils.kt
deleted file mode 100644
index e0af786e454d..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/arguments/serializationUtils.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-internal const val COMPILER_ARGUMENTS_ELEMENT_NAME = "compilerArguments"
-internal const val FLAG_ROOT_ELEMENTS_NAME = "flagArguments"
-internal const val FLAG_ELEMENT_NAME = "flagArg"
-internal const val STRING_ROOT_ELEMENTS_NAME = "stringArguments"
-internal const val STRING_ELEMENT_NAME = "stringArg"
-internal const val ARRAY_ROOT_ELEMENTS_NAME = "arrayArguments"
-internal const val ARRAY_ELEMENT_NAME = "arrayArg"
-internal const val FREE_ARGS_ROOT_ELEMENTS_NAME = "freeArgs"
-internal const val FREE_ARGS_ELEMENT_NAME = "freeArg"
-internal const val INTERNAL_ARGS_ROOT_ELEMENTS_NAME = "internalArgs"
-internal const val INTERNAL_ARGS_ELEMENT_NAME = "internalArg"
-
-internal const val NAME_ATTR_NAME = "name"
-internal const val ARG_ATTR_NAME = "arg"
-internal const val ARGS_ATTR_NAME = "args"
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.kt
deleted file mode 100644
index 97fb39c3dcdb..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import com.intellij.openapi.util.NlsSafe
-
-object CompilerRunnerConstants {
-    const val KOTLIN_COMPILER_NAME = "Kotlin"
-    @NlsSafe
-    const val INTERNAL_ERROR_PREFIX = "[Internal Error] "
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
deleted file mode 100644
index 05003fedc2b2..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import com.intellij.openapi.util.text.StringUtil
-import org.jetbrains.kotlin.cli.common.arguments.Freezable
-
-class CompilerSettings : Freezable() {
-    var additionalArguments: String by FreezableVar(DEFAULT_ADDITIONAL_ARGUMENTS)
-    var scriptTemplates: String by FreezableVar("")
-    var scriptTemplatesClasspath: String by FreezableVar("")
-    var copyJsLibraryFiles: Boolean by FreezableVar(true)
-    var outputDirectoryForJsLibraryFiles: String by FreezableVar(DEFAULT_OUTPUT_DIRECTORY)
-
-    companion object {
-        val DEFAULT_ADDITIONAL_ARGUMENTS = "-version"
-        private val DEFAULT_OUTPUT_DIRECTORY = "lib"
-    }
-}
-
-val CompilerSettings.additionalArgumentsAsList: List<String>
-    get() = splitArgumentString(additionalArguments)
-
-fun splitArgumentString(arguments: String) = StringUtil.splitHonorQuotes(arguments, ' ').map {
-    if (it.startsWith('"')) StringUtil.unescapeChar(StringUtil.unquoteString(it), '"') else it
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt
deleted file mode 100644
index 7ae0f5edc4c9..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/JpsUtils.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import com.intellij.openapi.application.ApplicationManager
-
-private const val APPLICATION_MANAGER_CLASS_NAME = "com.intellij.openapi.application.ApplicationManager"
-
-val isJps: Boolean by lazy {
-    /*
-        Normally, JPS shouldn't have an ApplicationManager class in the classpath,
-        but that's not true for JPS inside IDEA right now.
-        Though Application is not properly initialized inside JPS so we can use it as a check.
-     */
-    return@lazy if (doesClassExist(APPLICATION_MANAGER_CLASS_NAME)) {
-        ApplicationManager.getApplication() == null
-    } else {
-        true
-    }
-}
-
-private fun doesClassExist(fqName: String): Boolean {
-    val classPath = fqName.replace('.', '/') + ".class"
-    return {}.javaClass.classLoader.getResource(classPath) != null
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinCommonJpsModelSerializerExtension.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinCommonJpsModelSerializerExtension.kt
deleted file mode 100644
index 727ce1c309e6..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinCommonJpsModelSerializerExtension.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.config
-
-import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
-import org.jetbrains.jps.model.serialization.module.JpsModuleSourceRootPropertiesSerializer
-
-open class KotlinCommonJpsModelSerializerExtension : JpsModelSerializerExtension() {
-    override fun getModuleSourceRootPropertiesSerializers(): List<JpsModuleSourceRootPropertiesSerializer<*>> = listOf(
-        KotlinSourceRootPropertiesSerializer.Source,
-        KotlinSourceRootPropertiesSerializer.TestSource,
-        KotlinResourceRootPropertiesSerializer.Resource,
-        KotlinResourceRootPropertiesSerializer.TestResource
-    )
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
deleted file mode 100644
index f97ab59406a1..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.cli.common.arguments.Argument
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.copyBean
-import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
-import org.jetbrains.kotlin.platform.IdePlatformKind
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.TargetPlatformVersion
-import org.jetbrains.kotlin.platform.compat.toIdePlatform
-import org.jetbrains.kotlin.platform.isCommon
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.utils.DescriptionAware
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.findAnnotation
-
-@Deprecated("Use IdePlatformKind instead.", level = DeprecationLevel.ERROR)
-sealed class TargetPlatformKind<out Version : TargetPlatformVersion>(
-    val version: Version,
-    val name: String
-) : DescriptionAware {
-    override val description = "$name ${version.description}"
-
-    class Jvm(version: JvmTarget) : @Suppress("DEPRECATION_ERROR") TargetPlatformKind<JvmTarget>(version, "JVM") {
-        companion object {
-            private val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) }
-            operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal]
-        }
-    }
-
-    object JavaScript : @Suppress("DEPRECATION_ERROR") TargetPlatformKind<TargetPlatformVersion.NoVersion>(
-        TargetPlatformVersion.NoVersion,
-        "JavaScript"
-    )
-
-    object Common : @Suppress("DEPRECATION_ERROR") TargetPlatformKind<TargetPlatformVersion.NoVersion>(
-        TargetPlatformVersion.NoVersion,
-        "Common (experimental)"
-    )
-}
-
-sealed class VersionView : DescriptionAware {
-    abstract val version: LanguageOrApiVersion
-
-    object LatestStable : VersionView() {
-        override val version: LanguageVersion = RELEASED_VERSION
-
-        override val description: String
-            get() = "Latest stable (${version.versionString})"
-    }
-
-    class Specific(override val version: LanguageOrApiVersion) : VersionView() {
-        override val description: String
-            get() = version.description
-
-        override fun equals(other: Any?) = other is Specific && version == other.version
-
-        override fun hashCode() = version.hashCode()
-    }
-
-    companion object {
-        val RELEASED_VERSION = LanguageVersion.LATEST_STABLE
-
-        fun deserialize(value: String?, isAutoAdvance: Boolean): VersionView {
-            if (isAutoAdvance) return LatestStable
-            val languageVersion = LanguageVersion.fromVersionString(value)
-            return if (languageVersion != null) Specific(languageVersion) else LatestStable
-        }
-    }
-}
-
-var CommonCompilerArguments.languageVersionView: VersionView
-    get() = VersionView.deserialize(languageVersion, autoAdvanceLanguageVersion)
-    set(value) {
-        languageVersion = value.version.versionString
-        autoAdvanceLanguageVersion = value == VersionView.LatestStable
-    }
-
-var CommonCompilerArguments.apiVersionView: VersionView
-    get() = VersionView.deserialize(apiVersion, autoAdvanceApiVersion)
-    set(value) {
-        apiVersion = value.version.versionString
-        autoAdvanceApiVersion = value == VersionView.LatestStable
-    }
-
-enum class KotlinModuleKind {
-    DEFAULT,
-    SOURCE_SET_HOLDER,
-    COMPILATION_AND_SOURCE_SET_HOLDER;
-
-    @Deprecated("Use KotlinFacetSettings.mppVersion.isNewMpp")
-    val isNewMPP: Boolean
-        get() = this != DEFAULT
-}
-
-enum class KotlinMultiplatformVersion(val version: Int) {
-    M1(1), // the first implementation of MPP. Aka 1.2.0 MPP
-    M2(2), // the "New" MPP. Aka 1.3.0 MPP
-    M3(3) // the "Hierarchical" MPP.
-}
-
-val KotlinMultiplatformVersion?.isOldMpp: Boolean
-    get() = this == KotlinMultiplatformVersion.M1
-
-val KotlinMultiplatformVersion?.isNewMPP: Boolean
-    get() = this == KotlinMultiplatformVersion.M2
-
-val KotlinMultiplatformVersion?.isHmpp: Boolean
-    get() = this == KotlinMultiplatformVersion.M3
-
-interface ExternalSystemRunTask {
-    val taskName: String
-    val externalSystemProjectId: String
-    val targetName: String?
-}
-
-data class ExternalSystemTestRunTask(
-    override val taskName: String,
-    override val externalSystemProjectId: String,
-    override val targetName: String?
-) : ExternalSystemRunTask {
-
-    fun toStringRepresentation() = "$taskName|$externalSystemProjectId|$targetName"
-
-    companion object {
-        fun fromStringRepresentation(line: String) =
-            line.split("|").let { if (it.size == 3) ExternalSystemTestRunTask(it[0], it[1], it[2]) else null }
-    }
-
-    override fun toString() = "$taskName@$externalSystemProjectId [$targetName]"
-}
-
-data class ExternalSystemNativeMainRunTask(
-    override val taskName: String,
-    override val externalSystemProjectId: String,
-    override val targetName: String?,
-    val entryPoint: String,
-    val debuggable: Boolean,
-) : ExternalSystemRunTask {
-
-    fun toStringRepresentation() = "$taskName|$externalSystemProjectId|$targetName|$entryPoint|$debuggable"
-
-    companion object {
-        fun fromStringRepresentation(line: String): ExternalSystemNativeMainRunTask? =
-            line.split("|").let {
-                if (it.size == 5) ExternalSystemNativeMainRunTask(it[0], it[1], it[2], it[3], it[4].toBoolean()) else null
-            }
-    }
-}
-
-class KotlinFacetSettings {
-    companion object {
-        // Increment this when making serialization-incompatible changes to configuration data
-        val CURRENT_VERSION = 5
-        val DEFAULT_VERSION = 0
-    }
-
-    var version = CURRENT_VERSION
-    var useProjectSettings: Boolean = true
-
-    var mergedCompilerArguments: CommonCompilerArguments? = null
-        private set
-
-    // TODO: Workaround for unwanted facet settings modification on code analysis
-    // To be replaced with proper API for settings update (see BaseKotlinCompilerSettings as an example)
-    fun updateMergedArguments() {
-        val compilerArguments = compilerArguments
-        val compilerSettings = compilerSettings
-
-        mergedCompilerArguments = if (compilerArguments != null) {
-            copyBean(compilerArguments).apply {
-                if (compilerSettings != null) {
-                    parseCommandLineArguments(compilerSettings.additionalArgumentsAsList, this)
-                }
-            }
-        } else null
-    }
-
-    var compilerArguments: CommonCompilerArguments? = null
-        set(value) {
-            field = value?.unfrozen() as CommonCompilerArguments?
-            updateMergedArguments()
-        }
-
-    var compilerSettings: CompilerSettings? = null
-        set(value) {
-            field = value?.unfrozen() as CompilerSettings?
-            updateMergedArguments()
-        }
-
-    /*
-    This function is needed as some setting values may not be present in compilerArguments
-    but present in additional arguments instead, so we have to check both cases manually
-     */
-    inline fun <reified A : CommonCompilerArguments> isCompilerSettingPresent(settingReference: KProperty1<A, Boolean>): Boolean {
-        val isEnabledByCompilerArgument = compilerArguments?.safeAs<A>()?.let(settingReference::get)
-        if (isEnabledByCompilerArgument == true) return true
-        val isEnabledByAdditionalSettings = run {
-            val stringArgumentName = settingReference.findAnnotation<Argument>()?.value ?: return@run null
-            compilerSettings?.additionalArguments?.contains(stringArgumentName, ignoreCase = true)
-        }
-        return isEnabledByAdditionalSettings ?: false
-    }
-
-    var languageLevel: LanguageVersion?
-        get() = compilerArguments?.languageVersion?.let { LanguageVersion.fromFullVersionString(it) }
-        set(value) {
-            compilerArguments?.apply {
-                languageVersion = value?.versionString
-            }
-        }
-
-    var apiLevel: LanguageVersion?
-        get() = compilerArguments?.apiVersion?.let { LanguageVersion.fromFullVersionString(it) }
-        set(value) {
-            compilerArguments?.apply {
-                apiVersion = value?.versionString
-            }
-        }
-
-    var targetPlatform: TargetPlatform? = null
-        get() {
-            // This work-around is required in order to fix importing of the proper JVM target version and works only
-            // for fully actualized JVM target platform
-            //TODO(auskov): this hack should be removed after fixing equals in SimplePlatform
-            val args = compilerArguments
-            val singleSimplePlatform = field?.componentPlatforms?.singleOrNull()
-            if (singleSimplePlatform == JvmPlatforms.defaultJvmPlatform.singleOrNull() && args != null) {
-                return IdePlatformKind.platformByCompilerArguments(args)
-            }
-            return field
-        }
-
-    var externalSystemRunTasks: List<ExternalSystemRunTask> = emptyList()
-
-    @Suppress("DEPRECATION_ERROR")
-    @Deprecated(
-        message = "This accessor is deprecated and will be removed soon, use API from 'org.jetbrains.kotlin.platform.*' packages instead",
-        replaceWith = ReplaceWith("targetPlatform"),
-        level = DeprecationLevel.ERROR
-    )
-    fun getPlatform(): org.jetbrains.kotlin.platform.IdePlatform<*, *>? {
-        return targetPlatform?.toIdePlatform()
-    }
-
-    var implementedModuleNames: List<String> = emptyList() // used for first implementation of MPP, aka 'old' MPP
-    var dependsOnModuleNames: List<String> = emptyList() // used for New MPP and later implementations
-
-    var additionalVisibleModuleNames: Set<String> = emptySet()
-
-    var productionOutputPath: String? = null
-    var testOutputPath: String? = null
-
-    var kind: KotlinModuleKind = KotlinModuleKind.DEFAULT
-    var sourceSetNames: List<String> = emptyList()
-    var isTestModule: Boolean = false
-
-    var externalProjectId: String = ""
-
-    var isHmppEnabled: Boolean = false
-        @Deprecated(message = "Use mppVersion.isHmppEnabled", ReplaceWith("mppVersion.isHmpp"))
-        get
-
-    val mppVersion: KotlinMultiplatformVersion?
-        @Suppress("DEPRECATION")
-        get() = when {
-            isHmppEnabled -> KotlinMultiplatformVersion.M3
-            kind.isNewMPP -> KotlinMultiplatformVersion.M2
-            targetPlatform.isCommon() || implementedModuleNames.isNotEmpty() -> KotlinMultiplatformVersion.M1
-            else -> null
-        }
-
-    var pureKotlinSourceFolders: List<String> = emptyList()
-}
-
-interface KotlinFacetSettingsProvider {
-    fun getSettings(module: Module): KotlinFacetSettings?
-    fun getInitializedSettings(module: Module): KotlinFacetSettings
-
-    companion object {
-        fun getInstance(project: Project): KotlinFacetSettingsProvider? = project.takeUnless(Project::isDisposed)
-            ?.getService(KotlinFacetSettingsProvider::class.java)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt
deleted file mode 100644
index 66aa7d8e9666..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import org.jetbrains.jps.model.ex.JpsElementTypeBase
-import org.jetbrains.jps.model.java.JavaResourceRootProperties
-import org.jetbrains.jps.model.java.JavaResourceRootType
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-
-sealed class KotlinResourceRootType() : JpsElementTypeBase<JavaResourceRootProperties>(),
-    JpsModuleSourceRootType<JavaResourceRootProperties> {
-
-    override fun createDefaultProperties() =
-        JpsJavaExtensionService.getInstance().createResourceRootProperties("", false)
-}
-
-object ResourceKotlinRootType : KotlinResourceRootType()
-
-object TestResourceKotlinRootType : KotlinResourceRootType() {
-    override fun isForTests() = true
-}
-
-val ALL_KOTLIN_RESOURCE_ROOT_TYPES = setOf(ResourceKotlinRootType, TestResourceKotlinRootType)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt
deleted file mode 100644
index 495f0a58c3c4..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import org.jetbrains.jps.model.ex.JpsElementTypeBase
-import org.jetbrains.jps.model.java.JavaSourceRootProperties
-import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-
-sealed class KotlinSourceRootType() : JpsElementTypeBase<JavaSourceRootProperties>(), JpsModuleSourceRootType<JavaSourceRootProperties> {
-
-    override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("")
-
-}
-
-object SourceKotlinRootType : KotlinSourceRootType()
-
-object TestSourceKotlinRootType : KotlinSourceRootType() {
-    override fun isForTests() = true
-}
-
-val ALL_KOTLIN_SOURCE_ROOT_TYPES = setOf(SourceKotlinRootType, TestSourceKotlinRootType)
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.kt
deleted file mode 100644
index a1c37559a4a6..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-object SettingConstants {
-    const val KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION = "KotlinCommonCompilerArguments"
-    const val KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION = "Kotlin2JsCompilerArguments"
-    const val KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION = "Kotlin2JvmCompilerArguments"
-    const val KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings"
-    const val KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml"
-    const val KOTLIN_COMPILER_REFERENCE_INDEX_BUILDER_ID = "kotlin.compiler.ref.index"
-    const val KOTLIN_DATA_CONTAINER_ID = "kotlin-data-container"
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
deleted file mode 100644
index 724857f94c43..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+++ /dev/null
@@ -1,465 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import com.intellij.util.PathUtil
-import com.intellij.util.xmlb.SerializationFilter
-import com.intellij.util.xmlb.SkipDefaultsSerializationFilter
-import com.intellij.util.xmlb.XmlSerializer
-import org.jdom.DataConversionException
-import org.jdom.Element
-import org.jdom.Text
-import org.jetbrains.kotlin.arguments.COMPILER_ARGUMENTS_ELEMENT_NAME
-import org.jetbrains.kotlin.arguments.CompilerArgumentsDeserializerV5
-import org.jetbrains.kotlin.arguments.CompilerArgumentsSerializerV5
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.load.java.JvmAbi
-import org.jetbrains.kotlin.platform.*
-import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments
-import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
-import org.jetbrains.kotlin.platform.js.isJs
-import org.jetbrains.kotlin.platform.jvm.JdkPlatform
-import org.jetbrains.kotlin.platform.jvm.isJvm
-import org.jetbrains.kotlin.platform.konan.*
-import java.lang.reflect.Modifier
-import kotlin.reflect.KClass
-import kotlin.reflect.full.superclasses
-
-fun Element.getOption(name: String) = getChildren("option").firstOrNull { name == it?.getAttribute("name")?.value }
-
-private fun Element.getOptionValue(name: String) = getOption(name)?.getAttribute("value")?.value
-
-private fun Element.getOptionBody(name: String) = getOption(name)?.children?.firstOrNull()
-
-fun TargetPlatform.createArguments(init: (CommonCompilerArguments).() -> Unit = {}): CommonCompilerArguments {
-    return when {
-        isCommon() -> K2MetadataCompilerArguments().apply { init() }
-        isJvm() -> K2JVMCompilerArguments().apply {
-            init()
-            // TODO(dsavvinov): review this
-            jvmTarget = (single() as? JdkPlatform)?.targetVersion?.description ?: JvmTarget.DEFAULT.description
-        }
-        isJs() -> K2JSCompilerArguments().apply { init() }
-        isNative() -> FakeK2NativeCompilerArguments().apply { init() }
-        else -> error("Unknown platform $this")
-    }
-}
-
-private fun readV1Config(element: Element): KotlinFacetSettings {
-    return KotlinFacetSettings().apply {
-        val useProjectSettings = element.getOptionValue("useProjectSettings")?.toBoolean()
-
-        val versionInfoElement = element.getOptionBody("versionInfo")
-        val targetPlatformName = versionInfoElement?.getOptionValue("targetPlatformName")
-        val languageLevel = versionInfoElement?.getOptionValue("languageLevel")
-        val apiLevel = versionInfoElement?.getOptionValue("apiLevel")
-        val targetPlatform = CommonPlatforms.allSimplePlatforms.union(setOf(CommonPlatforms.defaultCommonPlatform))
-            .firstOrNull { it.oldFashionedDescription == targetPlatformName }
-            ?: JvmIdePlatformKind.defaultPlatform // FIXME(dsavvinov): choose proper default
-
-        val compilerInfoElement = element.getOptionBody("compilerInfo")
-
-        val compilerSettings = CompilerSettings().apply {
-            compilerInfoElement?.getOptionBody("compilerSettings")?.let { compilerSettingsElement ->
-                XmlSerializer.deserializeInto(this, compilerSettingsElement)
-            }
-        }
-
-        val commonArgumentsElement = compilerInfoElement?.getOptionBody("_commonCompilerArguments")
-        val jvmArgumentsElement = compilerInfoElement?.getOptionBody("k2jvmCompilerArguments")
-        val jsArgumentsElement = compilerInfoElement?.getOptionBody("k2jsCompilerArguments")
-
-        val compilerArguments = targetPlatform.createArguments { freeArgs = arrayListOf() }
-
-        commonArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
-        when (compilerArguments) {
-            is K2JVMCompilerArguments -> jvmArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
-            is K2JSCompilerArguments -> jsArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) }
-        }
-
-        if (languageLevel != null) {
-            compilerArguments.languageVersion = languageLevel
-        }
-
-        if (apiLevel != null) {
-            compilerArguments.apiVersion = apiLevel
-        }
-
-        compilerArguments.detectVersionAutoAdvance()
-
-        if (useProjectSettings != null) {
-            this.useProjectSettings = useProjectSettings
-        } else {
-            // Migration problem workaround for pre-1.1-beta releases (mainly 1.0.6) -> 1.1-rc+
-            // Problematic cases: 1.1-beta/1.1-beta2 -> 1.1-rc+ (useProjectSettings gets reset to false)
-            // This heuristic detects old enough configurations:
-            if (jvmArgumentsElement == null) {
-                this.useProjectSettings = false
-            }
-        }
-
-        this.compilerSettings = compilerSettings
-        this.compilerArguments = compilerArguments
-        this.targetPlatform = IdePlatformKind.platformByCompilerArguments(compilerArguments)
-    }
-}
-
-// TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235
-//  This is necessary to avoid having too much custom logic for platform serialization.
-fun Element.getFacetPlatformByConfigurationElement(): TargetPlatform {
-    getAttributeValue("allPlatforms").deserializeTargetPlatformByComponentPlatforms()?.let { return it }
-
-    // failed to read list of all platforms. Fallback to legacy algorithm
-    val platformName = getAttributeValue("platform") ?: return (null as TargetPlatform?).orDefault()
-    return CommonPlatforms.allSimplePlatforms.firstOrNull {
-        // first, look for exact match through all simple platforms
-        it.oldFashionedDescription == platformName
-    } ?: CommonPlatforms.defaultCommonPlatform.takeIf {
-        // then, check exact match for the default common platform
-        it.oldFashionedDescription == platformName
-    } ?: NativePlatforms.unspecifiedNativePlatform.takeIf {
-        // if none of the above succeeded, check if it's an old-style record about native platform (without suffix with target name)
-        it.oldFashionedDescription.startsWith(platformName)
-    }.orDefault() // finally, fallback to the default platform
-}
-
-private fun readV2AndLaterConfig(
-    element: Element,
-    argumentReader: (Element, CommonToolArguments) -> Unit = { el, arg -> XmlSerializer.deserializeInto(arg, el) }
-): KotlinFacetSettings {
-    return KotlinFacetSettings().apply {
-        element.getAttributeValue("useProjectSettings")?.let { useProjectSettings = it.toBoolean() }
-        val targetPlatform = element.getFacetPlatformByConfigurationElement()
-        this.targetPlatform = targetPlatform
-        readElementsList(element, "implements", "implement")?.let { implementedModuleNames = it }
-        readElementsList(element, "dependsOnModuleNames", "dependsOn")?.let { dependsOnModuleNames = it }
-        element.getChild("externalSystemTestTasks")?.let {
-            val testRunTasks = it.getChildren("externalSystemTestTask")
-                .mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim }
-                .mapNotNull { ExternalSystemTestRunTask.fromStringRepresentation(it) }
-            val nativeMainRunTasks = it.getChildren("externalSystemNativeMainRunTask")
-                .mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim }
-                .mapNotNull { ExternalSystemNativeMainRunTask.fromStringRepresentation(it) }
-
-            externalSystemRunTasks = testRunTasks + nativeMainRunTasks
-        }
-
-        element.getChild("sourceSets")?.let {
-            val items = it.getChildren("sourceSet")
-            sourceSetNames = items.mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim }
-        }
-        kind = element.getChild("newMppModelJpsModuleKind")?.let {
-            val kindName = (it.content.firstOrNull() as? Text)?.textTrim
-            if (kindName != null) {
-                try {
-                    KotlinModuleKind.valueOf(kindName)
-                } catch (e: Exception) {
-                    null
-                }
-            } else null
-        } ?: KotlinModuleKind.DEFAULT
-        isTestModule = element.getAttributeValue("isTestModule")?.toBoolean() ?: false
-        externalProjectId = element.getAttributeValue("externalProjectId") ?: ""
-        isHmppEnabled = element.getAttribute("isHmppProject")?.booleanValue ?: false
-        pureKotlinSourceFolders = element.getAttributeValue("pureKotlinSourceFolders")?.split(";")?.toList() ?: emptyList()
-        element.getChild("compilerSettings")?.let {
-            compilerSettings = CompilerSettings()
-            XmlSerializer.deserializeInto(compilerSettings!!, it)
-        }
-        element.getChild(COMPILER_ARGUMENTS_ELEMENT_NAME)?.let {
-            compilerArguments = targetPlatform.createArguments {
-                freeArgs = mutableListOf()
-                internalArguments = mutableListOf()
-            }
-            argumentReader(it, compilerArguments!!)
-            compilerArguments!!.detectVersionAutoAdvance()
-        }
-        productionOutputPath = element.getChild("productionOutputPath")?.let {
-            PathUtil.toSystemDependentName((it.content.firstOrNull() as? Text)?.textTrim)
-        } ?: (compilerArguments as? K2JSCompilerArguments)?.outputFile
-        testOutputPath = element.getChild("testOutputPath")?.let {
-            PathUtil.toSystemDependentName((it.content.firstOrNull() as? Text)?.textTrim)
-        } ?: (compilerArguments as? K2JSCompilerArguments)?.outputFile
-    }
-}
-
-private fun readElementsList(element: Element, rootElementName: String, elementName: String): List<String>? {
-    element.getChild(rootElementName)?.let {
-        val items = it.getChildren(elementName)
-        return if (items.isNotEmpty()) {
-            items.mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim }
-        } else {
-            listOfNotNull((it.content.firstOrNull() as? Text)?.textTrim)
-        }
-    }
-    return null
-}
-
-private fun readV2Config(element: Element): KotlinFacetSettings {
-    return readV2AndLaterConfig(element)
-}
-
-private fun readLatestConfig(element: Element): KotlinFacetSettings {
-    return readV2AndLaterConfig(element) { el, bean -> CompilerArgumentsDeserializerV5(bean).deserializeFrom(el) }
-}
-
-fun deserializeFacetSettings(element: Element): KotlinFacetSettings {
-    val version = try {
-        element.getAttribute("version")?.intValue
-    } catch (e: DataConversionException) {
-        null
-    } ?: KotlinFacetSettings.DEFAULT_VERSION
-    return when (version) {
-        1 -> readV1Config(element)
-        2, 3, 4 -> readV2Config(element)
-        KotlinFacetSettings.CURRENT_VERSION -> readLatestConfig(element)
-        else -> return KotlinFacetSettings() // Reset facet configuration if versions don't match
-    }.apply { this.version = version }
-}
-
-fun CommonCompilerArguments.convertPathsToSystemIndependent() {
-    pluginClasspaths?.forEachIndexed { index, s -> pluginClasspaths!![index] = PathUtil.toSystemIndependentName(s) }
-
-    when (this) {
-        is K2JVMCompilerArguments -> {
-            destination = PathUtil.toSystemIndependentName(destination)
-            classpath = PathUtil.toSystemIndependentName(classpath)
-            jdkHome = PathUtil.toSystemIndependentName(jdkHome)
-            kotlinHome = PathUtil.toSystemIndependentName(kotlinHome)
-            friendPaths?.forEachIndexed { index, s -> friendPaths!![index] = PathUtil.toSystemIndependentName(s) }
-            declarationsOutputPath = PathUtil.toSystemIndependentName(declarationsOutputPath)
-        }
-
-        is K2JSCompilerArguments -> {
-            outputFile = PathUtil.toSystemIndependentName(outputFile)
-            libraries = PathUtil.toSystemIndependentName(libraries)
-        }
-
-        is K2MetadataCompilerArguments -> {
-            destination = PathUtil.toSystemIndependentName(destination)
-            classpath = PathUtil.toSystemIndependentName(classpath)
-        }
-    }
-}
-
-fun CompilerSettings.convertPathsToSystemIndependent() {
-    scriptTemplatesClasspath = PathUtil.toSystemIndependentName(scriptTemplatesClasspath)
-    outputDirectoryForJsLibraryFiles = PathUtil.toSystemIndependentName(outputDirectoryForJsLibraryFiles)
-}
-
-private fun KClass<*>.superClass() = superclasses.firstOrNull { !it.java.isInterface }
-
-private fun Class<*>.computeNormalPropertyOrdering(): Map<String, Int> {
-    val result = LinkedHashMap<String, Int>()
-    var count = 0
-    generateSequence(this) { it.superclass }.forEach { clazz ->
-        for (field in clazz.declaredFields) {
-            if (field.modifiers and Modifier.STATIC != 0) continue
-
-            var propertyName = field.name
-            if (propertyName.endsWith(JvmAbi.DELEGATED_PROPERTY_NAME_SUFFIX)) {
-                propertyName = propertyName.dropLast(JvmAbi.DELEGATED_PROPERTY_NAME_SUFFIX.length)
-            }
-
-            result[propertyName] = count++
-        }
-    }
-    return result
-}
-
-private val allNormalOrderings = HashMap<Class<*>, Map<String, Int>>()
-
-private val Class<*>.normalOrdering
-    get() = synchronized(allNormalOrderings) { allNormalOrderings.getOrPut(this) { computeNormalPropertyOrdering() } }
-
-// Replacing fields with delegated properties leads to unexpected reordering of entries in facet configuration XML
-// It happens due to XmlSerializer using different orderings for field- and method-based accessors
-// This code restores the original ordering
-internal fun Element.restoreNormalOrdering(bean: Any) {
-    val normalOrdering = bean.javaClass.normalOrdering
-    val elementsToReorder = this.getContent<Element> { it is Element && it.getAttribute("name")?.value in normalOrdering }
-    elementsToReorder.sortedBy { normalOrdering[it.getAttribute("name")?.value!!] }
-        .forEachIndexed { index, element -> elementsToReorder[index] = element.clone() }
-}
-
-private fun buildChildElement(element: Element, tag: String, bean: Any, filter: SerializationFilter): Element {
-    return Element(tag).apply {
-        XmlSerializer.serializeInto(bean, this, filter)
-        restoreNormalOrdering(bean)
-        element.addContent(this)
-    }
-}
-
-private fun KotlinFacetSettings.writeConfig(element: Element) {
-    val filter = SkipDefaultsSerializationFilter()
-
-    // TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235
-    //  This is necessary to avoid having too much custom logic for platform serialization.
-    targetPlatform?.let { targetPlatform ->
-        element.setAttribute("platform", targetPlatform.oldFashionedDescription)
-        element.setAttribute("allPlatforms", targetPlatform.serializeComponentPlatforms())
-    }
-    if (!useProjectSettings) {
-        element.setAttribute("useProjectSettings", useProjectSettings.toString())
-    }
-    saveElementsList(element, implementedModuleNames, "implements", "implement")
-    saveElementsList(element, dependsOnModuleNames, "dependsOnModuleNames", "dependsOn")
-
-    if (sourceSetNames.isNotEmpty()) {
-        element.addContent(
-            Element("sourceSets").apply {
-                sourceSetNames.map { addContent(Element("sourceSet").apply { addContent(it) }) }
-            }
-        )
-    }
-    if (kind != KotlinModuleKind.DEFAULT) {
-        element.addContent(Element("newMppModelJpsModuleKind").apply { addContent(kind.name) })
-        element.setAttribute("isTestModule", isTestModule.toString())
-    }
-    if (externalProjectId.isNotEmpty()) {
-        element.setAttribute("externalProjectId", externalProjectId)
-    }
-    if (mppVersion.isHmpp) {
-        element.setAttribute("isHmppProject", mppVersion.isHmpp.toString())
-    }
-    if (externalSystemRunTasks.isNotEmpty()) {
-        element.addContent(
-            Element("externalSystemTestTasks").apply {
-                externalSystemRunTasks.forEach { task ->
-                    when (task) {
-                        is ExternalSystemTestRunTask -> {
-                            addContent(
-                                Element("externalSystemTestTask").apply { addContent(task.toStringRepresentation()) }
-                            )
-                        }
-                        is ExternalSystemNativeMainRunTask -> {
-                            addContent(
-                                Element("externalSystemNativeMainRunTask").apply { addContent(task.toStringRepresentation()) }
-                            )
-                        }
-                    }
-                }
-            }
-        )
-    }
-    if (pureKotlinSourceFolders.isNotEmpty()) {
-        element.setAttribute("pureKotlinSourceFolders", pureKotlinSourceFolders.joinToString(";"))
-    }
-    productionOutputPath?.let {
-        if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) {
-            element.addContent(Element("productionOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) })
-        }
-    }
-    testOutputPath?.let {
-        if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) {
-            element.addContent(Element("testOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) })
-        }
-    }
-    compilerSettings?.let { copyBean(it) }?.let {
-        it.convertPathsToSystemIndependent()
-        buildChildElement(element, "compilerSettings", it, filter)
-    }
-}
-
-private fun KotlinFacetSettings.writeV2toV4Config(element: Element) = writeConfig(element).apply {
-    compilerArguments?.let { copyBean(it) }?.let {
-        it.convertPathsToSystemIndependent()
-        val compilerArgumentsXml = buildChildElement(element, "compilerArguments", it, SkipDefaultsSerializationFilter())
-        compilerArgumentsXml.dropVersionsIfNecessary(it)
-    }
-}
-
-private fun KotlinFacetSettings.writeLatestConfig(element: Element) = writeConfig(element).apply {
-    compilerArguments?.let { copyBean(it) }?.let {
-        it.convertPathsToSystemIndependent()
-        val compilerArgumentsXml = CompilerArgumentsSerializerV5(it).serializeTo(element)
-        compilerArgumentsXml.dropVersionsIfNecessary(it)
-    }
-}
-
-private fun saveElementsList(element: Element, elementsList: List<String>, rootElementName: String, elementName: String) {
-    if (elementsList.isNotEmpty()) {
-        element.addContent(
-            Element(rootElementName).apply {
-                val singleModule = elementsList.singleOrNull()
-                if (singleModule != null) {
-                    addContent(singleModule)
-                } else {
-                    elementsList.map { addContent(Element(elementName).apply { addContent(it) }) }
-                }
-            }
-        )
-    }
-}
-
-fun CommonCompilerArguments.detectVersionAutoAdvance() {
-    autoAdvanceLanguageVersion = languageVersion == null
-    autoAdvanceApiVersion = apiVersion == null
-}
-
-fun Element.dropVersionsIfNecessary(settings: CommonCompilerArguments) {
-    // Do not serialize language/api version if they correspond to the default language version
-    if (settings.autoAdvanceLanguageVersion) {
-        getOption("languageVersion")?.detach()
-    }
-
-    if (settings.autoAdvanceApiVersion) {
-        getOption("apiVersion")?.detach()
-    }
-}
-
-fun KotlinFacetSettings.serializeFacetSettings(element: Element) = when (version) {
-    2, 3, 4 -> {
-        element.setAttribute("version", version.toString())
-        writeV2toV4Config(element)
-    }
-    else -> {
-        element.setAttribute("version", KotlinFacetSettings.CURRENT_VERSION.toString())
-        writeLatestConfig(element)
-    }
-}
-
-
-private fun TargetPlatform.serializeComponentPlatforms(): String {
-    val componentPlatforms = componentPlatforms
-    val componentPlatformNames = componentPlatforms.mapTo(ArrayList()) { it.serializeToString() }
-
-    // workaround for old Kotlin IDE plugins, KT-38634
-    if (componentPlatforms.any { it is NativePlatform })
-        componentPlatformNames.add(NativePlatformUnspecifiedTarget.legacySerializeToString())
-
-    return componentPlatformNames.sorted().joinToString("/")
-}
-
-private fun String?.deserializeTargetPlatformByComponentPlatforms(): TargetPlatform? {
-    val componentPlatformNames = this?.split('/')?.toSet()?.takeIf { it.isNotEmpty() } ?: return null
-
-    val knownComponentPlatforms = HashMap<String, SimplePlatform>() // "serialization presentation" to "simple platform name"
-
-    // first, collect serialization presentations for every known simple platform
-    CommonPlatforms.allSimplePlatforms
-        .flatMap { it.componentPlatforms }
-        .forEach { knownComponentPlatforms[it.serializeToString()] = it }
-
-    // next, add legacy aliases for some of the simple platforms; ex: unspecifiedNativePlatform
-    NativePlatformUnspecifiedTarget.let { knownComponentPlatforms[it.legacySerializeToString()] = it }
-
-    val componentPlatforms = componentPlatformNames.mapNotNull(knownComponentPlatforms::get).toSet()
-    return when (componentPlatforms.size) {
-        0 -> {
-            // empty set of component platforms is not allowed, in such case fallback to legacy algorithm
-            null
-        }
-        1 -> TargetPlatform(componentPlatforms)
-        else -> {
-            // workaround for old Kotlin IDE plugins, KT-38634
-            if (componentPlatforms.any { it is NativePlatformUnspecifiedTarget }
-                && componentPlatforms.any { it is NativePlatformWithTarget }
-            ) {
-                TargetPlatform(componentPlatforms - NativePlatformUnspecifiedTarget)
-            } else {
-                TargetPlatform(componentPlatforms)
-            }
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt
deleted file mode 100644
index a80b81e35d2c..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.config
-
-import org.jdom.Element
-import org.jetbrains.jps.model.java.JavaResourceRootProperties
-import org.jetbrains.jps.model.java.JavaSourceRootProperties
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer
-import org.jetbrains.jps.model.serialization.module.JpsModuleSourceRootPropertiesSerializer
-
-private const val IS_GENERATED_ATTRIBUTE = "generated"
-private const val RELATIVE_OUTPUT_PATH_ATTRIBUTE = "relativeOutputPath"
-
-const val KOTLIN_SOURCE_ROOT_TYPE_ID = "kotlin-source"
-const val KOTLIN_TEST_ROOT_TYPE_ID = "kotlin-test"
-const val KOTLIN_RESOURCE_ROOT_TYPE_ID = "kotlin-resource"
-const val KOTLIN_TEST_RESOURCE_ROOT_TYPE_ID = "kotlin-test-resource"
-
-// Based on org.jetbrains.jps.model.serialization.java.JpsJavaModelSerializerExtension.JavaSourceRootPropertiesSerializer class
-sealed class KotlinSourceRootPropertiesSerializer(
-    type: JpsModuleSourceRootType<JavaSourceRootProperties>,
-    typeId: String
-) : JpsModuleSourceRootPropertiesSerializer<JavaSourceRootProperties>(type, typeId) {
-    object Source : KotlinSourceRootPropertiesSerializer(
-        SourceKotlinRootType,
-        KOTLIN_SOURCE_ROOT_TYPE_ID
-    )
-
-    object TestSource : KotlinSourceRootPropertiesSerializer(
-        TestSourceKotlinRootType,
-        KOTLIN_TEST_ROOT_TYPE_ID
-    )
-
-    override fun loadProperties(sourceRootTag: Element): JavaSourceRootProperties {
-        val packagePrefix = sourceRootTag.getAttributeValue(JpsModuleRootModelSerializer.PACKAGE_PREFIX_ATTRIBUTE) ?: ""
-        val isGenerated = sourceRootTag.getAttributeValue(IS_GENERATED_ATTRIBUTE)?.toBoolean() ?: false
-        return JpsJavaExtensionService.getInstance().createSourceRootProperties(packagePrefix, isGenerated)
-    }
-
-    override fun saveProperties(properties: JavaSourceRootProperties, sourceRootTag: Element) {
-        val packagePrefix = properties.packagePrefix
-        if (packagePrefix.isNotEmpty()) {
-            sourceRootTag.setAttribute(JpsModuleRootModelSerializer.PACKAGE_PREFIX_ATTRIBUTE, packagePrefix)
-        }
-        if (properties.isForGeneratedSources) {
-            sourceRootTag.setAttribute(IS_GENERATED_ATTRIBUTE, "true")
-        }
-    }
-}
-
-// Based on org.jetbrains.jps.model.serialization.java.JpsJavaModelSerializerExtension.JavaResourceRootPropertiesSerializer
-sealed class KotlinResourceRootPropertiesSerializer(
-    type: JpsModuleSourceRootType<JavaResourceRootProperties>,
-    typeId: String
-) : JpsModuleSourceRootPropertiesSerializer<JavaResourceRootProperties>(type, typeId) {
-    object Resource : KotlinResourceRootPropertiesSerializer(
-        ResourceKotlinRootType,
-        KOTLIN_RESOURCE_ROOT_TYPE_ID
-    )
-
-    object TestResource : KotlinResourceRootPropertiesSerializer(
-        TestResourceKotlinRootType,
-        KOTLIN_TEST_RESOURCE_ROOT_TYPE_ID
-    )
-
-    override fun loadProperties(sourceRootTag: Element): JavaResourceRootProperties {
-        val relativeOutputPath = sourceRootTag.getAttributeValue(RELATIVE_OUTPUT_PATH_ATTRIBUTE) ?: ""
-        val isGenerated = sourceRootTag.getAttributeValue(IS_GENERATED_ATTRIBUTE)?.toBoolean() ?: false
-        return JpsJavaExtensionService.getInstance().createResourceRootProperties(relativeOutputPath, isGenerated)
-    }
-
-    override fun saveProperties(properties: JavaResourceRootProperties, sourceRootTag: Element) {
-        val relativeOutputPath = properties.relativeOutputPath
-        if (relativeOutputPath.isNotEmpty()) {
-            sourceRootTag.setAttribute(RELATIVE_OUTPUT_PATH_ATTRIBUTE, relativeOutputPath)
-        }
-        if (properties.isForGeneratedSources) {
-            sourceRootTag.setAttribute(IS_GENERATED_ATTRIBUTE, "true")
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/DefaultIdeTargetPlatformKindProvider.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/DefaultIdeTargetPlatformKindProvider.kt
deleted file mode 100644
index 24e6100c7470..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/DefaultIdeTargetPlatformKindProvider.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.platform
-
-import com.intellij.openapi.application.ApplicationManager
-import org.jetbrains.kotlin.config.isJps
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-
-interface DefaultIdeTargetPlatformKindProvider {
-    val defaultPlatform: TargetPlatform
-
-    companion object {
-        val defaultPlatform: TargetPlatform
-            get() {
-                if (isJps) {
-                    // TODO support passing custom platforms in JPS
-                    return JvmPlatforms.defaultJvmPlatform
-                }
-
-                return ApplicationManager.getApplication().getService(DefaultIdeTargetPlatformKindProvider::class.java).defaultPlatform
-            }
-    }
-}
-
-fun TargetPlatform?.orDefault(): TargetPlatform {
-    return this ?: DefaultIdeTargetPlatformKindProvider.defaultPlatform
-}
-
-fun IdePlatformKind<*>?.orDefault(): IdePlatformKind<*> {
-    return this ?: DefaultIdeTargetPlatformKindProvider.defaultPlatform.idePlatformKind
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatform.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatform.kt
deleted file mode 100644
index 3199f777bb87..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatform.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.platform
-
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.utils.DescriptionAware
-
-@Suppress("DEPRECATION_ERROR")
-@Deprecated(
-    message = "This interface is deprecated and will be removed soon, use API from 'org.jetbrains.kotlin.platform.*' packages instead",
-    replaceWith = ReplaceWith("TargetPlatform", "org.jetbrains.kotlin.platform.TargetPlatform"),
-    level = DeprecationLevel.ERROR
-)
-abstract class IdePlatform<Kind : IdePlatformKind<Kind>, out Arguments : CommonCompilerArguments> : DescriptionAware {
-    abstract val kind: Kind
-    abstract val version: TargetPlatformVersion
-
-    abstract fun createArguments(init: Arguments.() -> Unit = {}): Arguments
-
-    override val description
-        get() = kind.name + " " + version.description
-
-    override fun toString() = description
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
deleted file mode 100644
index 1dd370e2dbf8..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/IdePlatformKind.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:JvmName("IdePlatformKindUtil")
-
-package org.jetbrains.kotlin.platform
-
-import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.config.isJps
-import org.jetbrains.kotlin.extensions.ApplicationExtensionDescriptor
-import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
-
-abstract class IdePlatformKind<Kind : IdePlatformKind<Kind>> {
-    abstract fun supportsTargetPlatform(platform: TargetPlatform): Boolean
-
-    abstract val defaultPlatform: TargetPlatform
-
-    @Suppress("DEPRECATION_ERROR", "DeprecatedCallableAddReplaceWith")
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    abstract fun getDefaultPlatform(): IdePlatform<*, *>
-
-    abstract fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform?
-
-    abstract val argumentsClass: Class<out CommonCompilerArguments>
-
-    abstract val name: String
-
-    abstract fun createArguments(): CommonCompilerArguments
-
-    override fun equals(other: Any?): Boolean = javaClass == other?.javaClass
-    override fun hashCode(): Int = javaClass.hashCode()
-
-    override fun toString() = name
-
-    companion object {
-        // We can't use the ApplicationExtensionDescriptor class directly because it's missing in the JPS process
-        private val extension = run {
-            if (isJps) return@run null
-            ApplicationExtensionDescriptor("org.jetbrains.kotlin.idePlatformKind", IdePlatformKind::class.java)
-        }
-
-        // For using only in JPS
-        private val JPS_KINDS
-            get() = listOf(
-                JvmIdePlatformKind,
-                JsIdePlatformKind,
-                CommonIdePlatformKind,
-                NativeIdePlatformKind
-            )
-
-        val ALL_KINDS by lazy {
-            val kinds = extension?.getInstances() ?: return@lazy JPS_KINDS
-            require(kinds.isNotEmpty()) { "Platform kind list is empty" }
-            kinds
-        }
-
-
-        fun <Args : CommonCompilerArguments> platformByCompilerArguments(arguments: Args): TargetPlatform? =
-            ALL_KINDS.firstNotNullResult { it.platformByCompilerArguments(arguments) }
-
-    }
-}
-
-val TargetPlatform.idePlatformKind: IdePlatformKind<*>
-    get() = IdePlatformKind.ALL_KINDS.filter { it.supportsTargetPlatform(this) }.let { list ->
-        when {
-            list.size == 1 -> list.first()
-            list.size > 1 -> list.first().also {
-                Logger.getInstance(IdePlatformKind.javaClass).warn("Found more than one IdePlatformKind [$list] for target [$this].")
-            }
-            else -> error("Unknown platform $this")
-        }
-    }
-
-// TODO: replace with firstNotNullOfOrNull
-private inline fun <T, R : Any> Iterable<T>.firstNotNullResult(transform: (T) -> R?): R? {
-    for (element in this) {
-        val result = transform(element)
-        if (result != null) return result
-    }
-    return null
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt
deleted file mode 100644
index 9941338ae0c0..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:Suppress("DEPRECATION_ERROR", "TYPEALIAS_EXPANSION_DEPRECATION_ERROR")
-
-package org.jetbrains.kotlin.platform.compat
-
-import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.platform.CommonPlatforms
-import org.jetbrains.kotlin.platform.IdePlatform
-import org.jetbrains.kotlin.platform.impl.CommonIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
-import org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind
-import org.jetbrains.kotlin.platform.js.JsPlatform
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import org.jetbrains.kotlin.platform.jvm.JdkPlatform
-import org.jetbrains.kotlin.platform.jvm.JvmPlatform
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.platform.konan.NativePlatforms
-import org.jetbrains.kotlin.platform.konan.NativePlatform
-
-typealias OldPlatform = org.jetbrains.kotlin.resolve.TargetPlatform
-typealias NewPlatform = org.jetbrains.kotlin.platform.TargetPlatform
-
-fun NewPlatform.toOldPlatform(): OldPlatform = when (val single = singleOrNull()) {
-    null -> CommonPlatforms.CompatCommonPlatform
-    is JvmPlatform -> JvmPlatforms.CompatJvmPlatform
-    is JsPlatform -> JsPlatforms.CompatJsPlatform
-    is NativePlatform -> NativePlatforms.CompatNativePlatform
-    else -> error("Unknown platform $single")
-}
-
-fun OldPlatform.toNewPlatform(): NewPlatform = when (this) {
-    is CommonPlatforms.CompatCommonPlatform -> this
-    is JvmPlatforms.CompatJvmPlatform -> this
-    is JsPlatforms.CompatJsPlatform -> this
-    is NativePlatforms.CompatNativePlatform -> this
-    else -> error(
-        "Can't convert org.jetbrains.kotlin.resolve.TargetPlatform to org.jetbrains.kotlin.platform.TargetPlatform: " +
-                "non-Compat instance passed\n" +
-                "toString: $this\n" +
-                "class: ${this::class}\n" +
-                "hashCode: ${this.hashCode().toString(16)}"
-    )
-}
-
-fun IdePlatform<*, *>.toNewPlatform(): NewPlatform = when (this) {
-    is CommonIdePlatformKind.Platform -> CommonPlatforms.defaultCommonPlatform
-    is JvmIdePlatformKind.Platform -> JvmPlatforms.jvmPlatformByTargetVersion(this.version)
-    is JsIdePlatformKind.Platform -> JsPlatforms.defaultJsPlatform
-    is NativeIdePlatformKind.Platform -> NativePlatforms.unspecifiedNativePlatform
-    else -> error("Unknown platform $this")
-}
-
-fun NewPlatform.toIdePlatform(): IdePlatform<*, *> = when (val single = singleOrNull()) {
-    null -> CommonIdePlatformKind.Platform
-    is JdkPlatform -> JvmIdePlatformKind.Platform(single.targetVersion)
-    is JvmPlatform -> JvmIdePlatformKind.Platform(JvmTarget.DEFAULT)
-    is JsPlatform -> JsIdePlatformKind.Platform
-    is NativePlatform -> NativeIdePlatformKind.Platform
-    else -> error("Unknown platform $single")
-}
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/CommonIdePlatformKind.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/CommonIdePlatformKind.kt
deleted file mode 100644
index e3bc19d369a5..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/CommonIdePlatformKind.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:JvmName("CommonIdePlatformUtil")
-@file:Suppress("DEPRECATION_ERROR", "DeprecatedCallableAddReplaceWith")
-
-package org.jetbrains.kotlin.platform.impl
-
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.platform.*
-
-object CommonIdePlatformKind : IdePlatformKind<CommonIdePlatformKind>() {
-    override fun supportsTargetPlatform(platform: TargetPlatform) = platform.isCommon()
-
-    override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? {
-        return if (arguments is K2MetadataCompilerArguments)
-            CommonPlatforms.defaultCommonPlatform
-        else
-            null
-    }
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    override fun getDefaultPlatform(): IdePlatform<*, *> = Platform
-
-    override fun createArguments(): CommonCompilerArguments {
-        return K2MetadataCompilerArguments() // TODO(dsavvinov): review that, as now MPP !== K2Metadata
-    }
-
-    override val defaultPlatform get() = CommonPlatforms.defaultCommonPlatform
-
-    override val argumentsClass get() = K2MetadataCompilerArguments::class.java
-
-    override val name get() = "Common (experimental)"
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    object Platform : IdePlatform<CommonIdePlatformKind, CommonCompilerArguments>() {
-        override val kind get() = CommonIdePlatformKind
-        override val version get() = TargetPlatformVersion.NoVersion
-        override fun createArguments(init: CommonCompilerArguments.() -> Unit) = K2MetadataCompilerArguments().apply(init)
-    }
-}
-
-val IdePlatformKind<*>?.isCommon
-    get() = this is CommonIdePlatformKind
-
-@Deprecated(
-    message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-    level = DeprecationLevel.ERROR
-)
-val IdePlatform<*, *>.isCommon: Boolean
-    get() = this is CommonIdePlatformKind.Platform
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/IdeaDefaultIdeTargetPlatformKindProvider.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/IdeaDefaultIdeTargetPlatformKindProvider.kt
deleted file mode 100644
index 647b9c6d6e2b..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/IdeaDefaultIdeTargetPlatformKindProvider.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.platform.impl
-
-import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider
-
-class IdeaDefaultIdeTargetPlatformKindProvider private constructor() : DefaultIdeTargetPlatformKindProvider {
-    override val defaultPlatform = JvmIdePlatformKind.defaultPlatform
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt
deleted file mode 100644
index 4159789a2483..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:JvmName("JsIdePlatformUtil")
-@file:Suppress("DEPRECATION_ERROR", "DeprecatedCallableAddReplaceWith")
-
-package org.jetbrains.kotlin.platform.impl
-
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.platform.IdePlatform
-import org.jetbrains.kotlin.platform.IdePlatformKind
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.TargetPlatformVersion
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import org.jetbrains.kotlin.platform.js.isJs
-
-object JsIdePlatformKind : IdePlatformKind<JsIdePlatformKind>() {
-    override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJs()
-
-    override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? {
-        return if (arguments is K2JSCompilerArguments)
-            JsPlatforms.defaultJsPlatform
-        else
-            null
-    }
-
-    val platforms get() = listOf(JsPlatforms.defaultJsPlatform)
-    override val defaultPlatform get() = JsPlatforms.defaultJsPlatform
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    override fun getDefaultPlatform(): IdePlatform<*, *> = Platform
-
-    override fun createArguments(): CommonCompilerArguments {
-        return K2JSCompilerArguments()
-    }
-
-    override val argumentsClass get() = K2JSCompilerArguments::class.java
-
-    override val name get() = "JavaScript"
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    object Platform : IdePlatform<JsIdePlatformKind, K2JSCompilerArguments>() {
-        override val kind get() = JsIdePlatformKind
-        override val version get() = TargetPlatformVersion.NoVersion
-        override fun createArguments(init: K2JSCompilerArguments.() -> Unit) = K2JSCompilerArguments().apply(init)
-    }
-}
-
-val IdePlatformKind<*>?.isJavaScript
-    get() = this is JsIdePlatformKind
-
-@Deprecated(
-    message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-    level = DeprecationLevel.ERROR
-)
-val IdePlatform<*, *>?.isJavaScript
-    get() = this is JsIdePlatformKind.Platform
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt
deleted file mode 100644
index fa3ad6428f36..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:JvmName("JvmIdePlatformUtil")
-@file:Suppress("DEPRECATION_ERROR", "DeprecatedCallableAddReplaceWith")
-
-package org.jetbrains.kotlin.platform.impl
-
-import com.intellij.util.text.VersionComparatorUtil
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.platform.IdePlatform
-import org.jetbrains.kotlin.platform.IdePlatformKind
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.platform.jvm.isJvm
-
-object JvmIdePlatformKind : IdePlatformKind<JvmIdePlatformKind>() {
-    override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJvm()
-
-    override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? {
-        if (arguments !is K2JVMCompilerArguments) return null
-
-        val jvmTargetDescription = arguments.jvmTarget
-            ?: return JvmPlatforms.defaultJvmPlatform
-
-        val jvmTarget = JvmTarget.values()
-            .firstOrNull { VersionComparatorUtil.COMPARATOR.compare(it.description, jvmTargetDescription) >= 0 }
-            ?: return JvmPlatforms.defaultJvmPlatform
-
-        return JvmPlatforms.jvmPlatformByTargetVersion(jvmTarget)
-    }
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    override fun getDefaultPlatform(): Platform = Platform(JvmTarget.DEFAULT)
-
-    override fun createArguments(): CommonCompilerArguments {
-        return K2JVMCompilerArguments()
-    }
-
-    val platforms: List<TargetPlatform> = JvmTarget.values()
-        .map { ver -> JvmPlatforms.jvmPlatformByTargetVersion(ver) } + listOf(JvmPlatforms.unspecifiedJvmPlatform)
-
-    override val defaultPlatform get() = JvmPlatforms.defaultJvmPlatform
-
-    override val argumentsClass get() = K2JVMCompilerArguments::class.java
-
-    override val name get() = "JVM"
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    data class Platform(override val version: JvmTarget) : IdePlatform<JvmIdePlatformKind, K2JVMCompilerArguments>() {
-        override val kind get() = JvmIdePlatformKind
-
-        override fun createArguments(init: K2JVMCompilerArguments.() -> Unit) = K2JVMCompilerArguments()
-            .apply(init)
-            .apply { jvmTarget = this@Platform.version.description }
-    }
-}
-
-val IdePlatformKind<*>?.isJvm
-    get() = this is JvmIdePlatformKind
-
-@Deprecated(
-    message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-    level = DeprecationLevel.ERROR
-)
-val IdePlatform<*, *>.isJvm: Boolean
-    get() = this is JvmIdePlatformKind.Platform
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt b/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt
deleted file mode 100644
index f1003ce8cc37..000000000000
--- a/plugins/kotlin/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-@file:JvmName("NativeIdePlatformUtil")
-@file:Suppress("DEPRECATION_ERROR", "DeprecatedCallableAddReplaceWith")
-
-package org.jetbrains.kotlin.platform.impl
-
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.platform.IdePlatform
-import org.jetbrains.kotlin.platform.IdePlatformKind
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.platform.TargetPlatformVersion
-import org.jetbrains.kotlin.platform.konan.NativePlatforms
-import org.jetbrains.kotlin.platform.konan.isNative
-
-object NativeIdePlatformKind : IdePlatformKind<NativeIdePlatformKind>() {
-    override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isNative()
-
-    override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? {
-        return if (arguments is FakeK2NativeCompilerArguments)
-            NativePlatforms.unspecifiedNativePlatform
-        else
-            null
-    }
-
-    override fun createArguments(): CommonCompilerArguments {
-        return FakeK2NativeCompilerArguments()
-    }
-
-    override val defaultPlatform: TargetPlatform
-        get() = NativePlatforms.unspecifiedNativePlatform
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    override fun getDefaultPlatform(): IdePlatform<*, *> = Platform
-
-    override val argumentsClass
-        get() = FakeK2NativeCompilerArguments::class.java
-
-    override val name
-        get() = "Native"
-
-    @Deprecated(
-        message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-        level = DeprecationLevel.ERROR
-    )
-    object Platform : IdePlatform<NativeIdePlatformKind, FakeK2NativeCompilerArguments>() {
-        override val kind get() = NativeIdePlatformKind
-        override val version get() = TargetPlatformVersion.NoVersion
-        override fun createArguments(init: FakeK2NativeCompilerArguments.() -> Unit) = FakeK2NativeCompilerArguments().apply(init)
-    }
-}
-
-// These are fake compiler arguments for Kotlin/Native - only for usage within IDEA plugin:
-class FakeK2NativeCompilerArguments : CommonCompilerArguments()
-
-val IdePlatformKind<*>?.isKotlinNative
-    get() = this is NativeIdePlatformKind
-
-@Deprecated(
-    message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform",
-    level = DeprecationLevel.ERROR
-)
-val IdePlatform<*, *>?.isKotlinNative
-    get() = this is NativeIdePlatformKind.Platform
diff --git a/plugins/kotlin/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt b/plugins/kotlin/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt
deleted file mode 100644
index 1bccc00bdd07..000000000000
--- a/plugins/kotlin/jps/jps-common/test/CompilerArgumentsContentProspectorTest.kt
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.junit.Test
-import org.junit.Assert.*
-import kotlin.reflect.KProperty
-
-
-class CompilerArgumentsContentProspectorTest {
-
-    @Test
-    fun testJVMArgumentsContent() {
-        val flagProperties = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(K2JVMCompilerArguments::class)
-        val stringProperties = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(K2JVMCompilerArguments::class)
-        val arrayProperties = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(K2JVMCompilerArguments::class)
-
-        assertContentEquals(flagProperties, k2JVMCompilerArgumentsFlagProperties)
-        assertContentEquals(stringProperties, k2JVMCompilerArgumentsStringProperties)
-        assertContentEquals(arrayProperties, k2JVMCompilerArgumentsArrayArgumentProperties)
-    }
-
-    @Test
-    fun testMetadataArgumentsContent() {
-        val flagProperties = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(K2MetadataCompilerArguments::class)
-        val stringProperties = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(K2MetadataCompilerArguments::class)
-        val arrayProperties = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(K2MetadataCompilerArguments::class)
-
-        assertContentEquals(flagProperties, k2MetadataCompilerArgumentsFlagProperties)
-        assertContentEquals(stringProperties, k2MetadataCompilerArgumentsStringProperties)
-        assertContentEquals(arrayProperties, k2MetadataCompilerArgumentsArrayProperties)
-    }
-
-    @Test
-    fun testJsArgumentsContent() {
-        val flagProperties = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(K2JSCompilerArguments::class)
-        val stringProperties = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(K2JSCompilerArguments::class)
-        val arrayProperties = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(K2JSCompilerArguments::class)
-
-        assertContentEquals(flagProperties, k2JSCompilerArgumentsFlagProperties)
-        assertContentEquals(stringProperties, k2JSCompilerArgumentsStringProperties)
-        assertContentEquals(arrayProperties, k2JSCompilerArgumentsArrayProperties)
-    }
-
-    @Test
-    fun testJsDceArgumentsContent() {
-        val flagProperties = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(K2JSDceArguments::class)
-        val stringProperties = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(K2JSDceArguments::class)
-        val arrayProperties = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(K2JSDceArguments::class)
-
-        assertContentEquals(flagProperties, k2JSDceCompilerArgumentsFlagProperties)
-        assertContentEquals(stringProperties, k2JSDceCompilerArgumentsStringProperties)
-        assertContentEquals(arrayProperties, k2JSDceCompilerArgumentsArrayProperties)
-    }
-
-    companion object {
-
-        private val commonToolArgumentsFlagProperties = listOf(
-            CommonToolArguments::allWarningsAsErrors,
-            CommonToolArguments::extraHelp,
-            CommonToolArguments::help,
-            CommonToolArguments::suppressWarnings,
-            CommonToolArguments::verbose,
-            CommonToolArguments::version,
-        )
-
-        private val commonCompilerArgumentsFlagProperties = commonToolArgumentsFlagProperties + listOf(
-            CommonCompilerArguments::allowKotlinPackage,
-            CommonCompilerArguments::progressiveMode,
-            CommonCompilerArguments::script,
-            CommonCompilerArguments::selfUpperBoundInference,
-            CommonCompilerArguments::noInline,
-            CommonCompilerArguments::skipMetadataVersionCheck,
-            CommonCompilerArguments::skipPrereleaseCheck,
-            CommonCompilerArguments::reportOutputFiles,
-            CommonCompilerArguments::multiPlatform,
-            CommonCompilerArguments::noCheckActual,
-            CommonCompilerArguments::newInference,
-            CommonCompilerArguments::inlineClasses,
-            CommonCompilerArguments::legacySmartCastAfterTry,
-            CommonCompilerArguments::effectSystem,
-            CommonCompilerArguments::enableBuilderInference,
-            CommonCompilerArguments::readDeserializedContracts,
-            CommonCompilerArguments::properIeee754Comparisons,
-            CommonCompilerArguments::reportPerf,
-            CommonCompilerArguments::allowResultReturnType,
-            CommonCompilerArguments::builtInsFromSources,
-            CommonCompilerArguments::listPhases,
-            CommonCompilerArguments::profilePhases,
-            CommonCompilerArguments::normalizeAbsolutePath,
-            CommonCompilerArguments::checkPhaseConditions,
-            CommonCompilerArguments::checkStickyPhaseConditions,
-            CommonCompilerArguments::useFir,
-            CommonCompilerArguments::unrestrictedBuilderInference,
-            CommonCompilerArguments::useFirExtendedCheckers,
-            CommonCompilerArguments::disableUltraLightClasses,
-            CommonCompilerArguments::useMixedNamedArguments,
-            CommonCompilerArguments::expectActualLinker,
-            CommonCompilerArguments::extendedCompilerChecks,
-            CommonCompilerArguments::disableDefaultScriptingPlugin,
-            CommonCompilerArguments::inferenceCompatibility,
-            CommonCompilerArguments::suppressVersionWarnings,
-            CommonCompilerArguments::contextReceivers,
-        )
-
-        private val commonCompilerArgumentsStringProperties = listOf(
-            CommonCompilerArguments::languageVersion,
-            CommonCompilerArguments::apiVersion,
-            CommonCompilerArguments::intellijPluginRoot,
-            CommonCompilerArguments::dumpPerf,
-            CommonCompilerArguments::metadataVersion,
-            CommonCompilerArguments::dumpDirectory,
-            CommonCompilerArguments::dumpOnlyFqName,
-            CommonCompilerArguments::explicitApi,
-            CommonCompilerArguments::kotlinHome
-        )
-        private val commonCompilerArgumentsArrayProperties = listOf(
-            CommonCompilerArguments::pluginOptions,
-            CommonCompilerArguments::pluginClasspaths,
-            CommonCompilerArguments::useExperimental,
-            CommonCompilerArguments::optIn,
-            CommonCompilerArguments::optInDeprecated,
-            CommonCompilerArguments::commonSources,
-            CommonCompilerArguments::disablePhases,
-            CommonCompilerArguments::verbosePhases,
-            CommonCompilerArguments::phasesToDumpBefore,
-            CommonCompilerArguments::phasesToDumpAfter,
-            CommonCompilerArguments::phasesToDump,
-            CommonCompilerArguments::namesExcludedFromDumping,
-            CommonCompilerArguments::phasesToValidateBefore,
-            CommonCompilerArguments::phasesToValidateAfter,
-            CommonCompilerArguments::phasesToValidate,
-            CommonCompilerArguments::relativePathBases,
-        )
-
-        private val k2JVMCompilerArgumentsFlagProperties = commonCompilerArgumentsFlagProperties + listOf(
-            K2JVMCompilerArguments::includeRuntime,
-            K2JVMCompilerArguments::noJdk,
-            K2JVMCompilerArguments::noStdlib,
-            K2JVMCompilerArguments::noReflect,
-            K2JVMCompilerArguments::javaParameters,
-            K2JVMCompilerArguments::useIR,
-            K2JVMCompilerArguments::useOldBackend,
-            K2JVMCompilerArguments::allowUnstableDependencies,
-            K2JVMCompilerArguments::doNotClearBindingContext,
-            K2JVMCompilerArguments::noCallAssertions,
-            K2JVMCompilerArguments::noReceiverAssertions,
-            K2JVMCompilerArguments::noParamAssertions,
-            K2JVMCompilerArguments::noOptimize,
-            K2JVMCompilerArguments::inheritMultifileParts,
-            K2JVMCompilerArguments::useTypeTable,
-            K2JVMCompilerArguments::validateBytecode,
-            K2JVMCompilerArguments::validateIr,
-            K2JVMCompilerArguments::useOldClassFilesReading,
-            K2JVMCompilerArguments::singleModule,
-            K2JVMCompilerArguments::suppressMissingBuiltinsError,
-            K2JVMCompilerArguments::useJavac,
-            K2JVMCompilerArguments::compileJava,
-            K2JVMCompilerArguments::disableStandardScript,
-            K2JVMCompilerArguments::strictMetadataVersionSemantics,
-            K2JVMCompilerArguments::suppressDeprecatedJvmTargetWarning,
-            K2JVMCompilerArguments::useFastJarFileSystem,
-            K2JVMCompilerArguments::typeEnhancementImprovementsInStrictMode,
-            K2JVMCompilerArguments::sanitizeParentheses,
-            K2JVMCompilerArguments::allowNoSourceFiles,
-            K2JVMCompilerArguments::emitJvmTypeAnnotations,
-            K2JVMCompilerArguments::noOptimizedCallableReferences,
-            K2JVMCompilerArguments::noKotlinNothingValueException,
-            K2JVMCompilerArguments::noResetJarTimestamps,
-            K2JVMCompilerArguments::noUnifiedNullChecks,
-            K2JVMCompilerArguments::useOldInlineClassesManglingScheme,
-            K2JVMCompilerArguments::enableJvmPreview,
-            K2JVMCompilerArguments::enhanceTypeParameterTypesToDefNotNull,
-        )
-
-        private val k2JVMCompilerArgumentsStringProperties = commonCompilerArgumentsStringProperties + listOf(
-            K2JVMCompilerArguments::destination,
-            K2JVMCompilerArguments::classpath,
-            K2JVMCompilerArguments::jdkHome,
-            K2JVMCompilerArguments::expression,
-            K2JVMCompilerArguments::parallelBackendThreads,
-            K2JVMCompilerArguments::moduleName,
-            K2JVMCompilerArguments::jvmTarget,
-            K2JVMCompilerArguments::abiStability,
-            K2JVMCompilerArguments::javaModulePath,
-            K2JVMCompilerArguments::assertionsMode,
-            K2JVMCompilerArguments::buildFile,
-            K2JVMCompilerArguments::declarationsOutputPath,
-            K2JVMCompilerArguments::javaPackagePrefix,
-            K2JVMCompilerArguments::supportCompatqualCheckerFrameworkAnnotations,
-            K2JVMCompilerArguments::jspecifyAnnotations,
-            K2JVMCompilerArguments::jvmDefault,
-            K2JVMCompilerArguments::defaultScriptExtension,
-            K2JVMCompilerArguments::stringConcat,
-            K2JVMCompilerArguments::klibLibraries,
-            K2JVMCompilerArguments::profileCompilerCommand,
-            K2JVMCompilerArguments::repeatCompileModules,
-            K2JVMCompilerArguments::lambdas,
-            K2JVMCompilerArguments::samConversions,
-            K2JVMCompilerArguments::serializeIr,
-        )
-
-        private val k2JVMCompilerArgumentsArrayArgumentProperties = commonCompilerArgumentsArrayProperties + listOf(
-            K2JVMCompilerArguments::scriptTemplates,
-            K2JVMCompilerArguments::additionalJavaModules,
-            K2JVMCompilerArguments::scriptResolverEnvironment,
-            K2JVMCompilerArguments::javacArguments,
-            K2JVMCompilerArguments::javaSourceRoots,
-            K2JVMCompilerArguments::jsr305,
-            K2JVMCompilerArguments::nullabilityAnnotations,
-            K2JVMCompilerArguments::friendPaths
-        )
-
-        private val k2MetadataCompilerArgumentsFlagProperties = commonCompilerArgumentsFlagProperties + listOf(
-            K2MetadataCompilerArguments::enabledInJps
-        )
-        private val k2MetadataCompilerArgumentsStringProperties = commonCompilerArgumentsStringProperties + listOf(
-            K2MetadataCompilerArguments::destination,
-            K2MetadataCompilerArguments::classpath,
-            K2MetadataCompilerArguments::moduleName
-        )
-        private val k2MetadataCompilerArgumentsArrayProperties = commonCompilerArgumentsArrayProperties + listOf(
-            K2MetadataCompilerArguments::friendPaths,
-            K2MetadataCompilerArguments::refinesPaths,
-        )
-        private val k2JSCompilerArgumentsFlagProperties = commonCompilerArgumentsFlagProperties + listOf(
-            K2JSCompilerArguments::noStdlib,
-            K2JSCompilerArguments::sourceMap,
-            K2JSCompilerArguments::metaInfo,
-            K2JSCompilerArguments::irProduceKlibDir,
-            K2JSCompilerArguments::irProduceKlibFile,
-            K2JSCompilerArguments::irProduceJs,
-            K2JSCompilerArguments::irDce,
-            K2JSCompilerArguments::irDceDriven,
-            K2JSCompilerArguments::irDcePrintReachabilityInfo,
-            K2JSCompilerArguments::irNewIr2Js,
-            K2JSCompilerArguments::irPropertyLazyInitialization,
-            K2JSCompilerArguments::irOnly,
-            K2JSCompilerArguments::irPerModule,
-            K2JSCompilerArguments::irPerFile,
-            K2JSCompilerArguments::generateDts,
-            K2JSCompilerArguments::typedArrays,
-            K2JSCompilerArguments::friendModulesDisabled,
-            K2JSCompilerArguments::metadataOnly,
-            K2JSCompilerArguments::enableJsScripting,
-            K2JSCompilerArguments::fakeOverrideValidator,
-            K2JSCompilerArguments::wasm,
-            K2JSCompilerArguments::extensionFunctionsInExternals,
-            K2JSCompilerArguments::irBaseClassInMetadata,
-            K2JSCompilerArguments::irBuildCache,
-            K2JSCompilerArguments::irSafeExternalBoolean,
-            K2JSCompilerArguments::partialLinkage,
-            K2JSCompilerArguments::wasmDebug,
-            K2JSCompilerArguments::wasmKClassFqn,
-        )
-        private val k2JSCompilerArgumentsStringProperties = commonCompilerArgumentsStringProperties + listOf(
-            K2JSCompilerArguments::outputFile,
-            K2JSCompilerArguments::libraries,
-            K2JSCompilerArguments::sourceMapPrefix,
-            K2JSCompilerArguments::sourceMapBaseDirs,
-            K2JSCompilerArguments::sourceMapEmbedSources,
-            K2JSCompilerArguments::target,
-            K2JSCompilerArguments::moduleKind,
-            K2JSCompilerArguments::main,
-            K2JSCompilerArguments::outputPrefix,
-            K2JSCompilerArguments::outputPostfix,
-            K2JSCompilerArguments::irModuleName,
-            K2JSCompilerArguments::includes,
-            K2JSCompilerArguments::friendModules,
-            K2JSCompilerArguments::errorTolerancePolicy,
-            K2JSCompilerArguments::irDceRuntimeDiagnostic,
-            K2JSCompilerArguments::repositries,
-            K2JSCompilerArguments::cacheDirectories,
-            K2JSCompilerArguments::irPerModuleOutputName,
-            K2JSCompilerArguments::irSafeExternalBooleanDiagnostic,
-            K2JSCompilerArguments::wasmLauncher,
-        )
-        private val k2JSCompilerArgumentsArrayProperties = commonCompilerArgumentsArrayProperties
-
-        private val k2JSDceCompilerArgumentsFlagProperties = commonToolArgumentsFlagProperties + listOf(
-            K2JSDceArguments::devMode,
-            K2JSDceArguments::printReachabilityInfo,
-        )
-        private val k2JSDceCompilerArgumentsStringProperties = listOf(
-            K2JSDceArguments::outputDirectory,
-            K2JSDceArguments::devModeOverwritingStrategy,
-        )
-        private val k2JSDceCompilerArgumentsArrayProperties = listOf(
-            K2JSDceArguments::declarationsToKeep
-        )
-
-        private fun assertContentEquals(expect: Collection<KProperty<*>>, actual: Collection<KProperty<*>>) {
-            //assert(expect.count() == actual.count()) {
-            //    "Expected arguments count \"${expect.count()}\" doesn't match with actual \"${actual.count()}\"!"
-            //}
-            val processor: (Collection<KProperty<*>>) -> Collection<String> = { el -> el.map { it.name }.sorted() }
-            assertEquals(
-                processor(expect).joinToString("\n"),
-                processor(actual).joinToString("\n")
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-common/test/CompilerArgumentsSerializationTest.kt b/plugins/kotlin/jps/jps-common/test/CompilerArgumentsSerializationTest.kt
deleted file mode 100644
index 135e2657f2bb..000000000000
--- a/plugins/kotlin/jps/jps-common/test/CompilerArgumentsSerializationTest.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.arguments
-
-import org.jdom.Element
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.utils.addToStdlib.cast
-import org.jetbrains.kotlin.utils.addToStdlib.safeAs
-import org.junit.Assert
-import org.junit.Test
-import kotlin.random.Random
-import kotlin.reflect.KClass
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.memberProperties
-
-class CompilerArgumentsSerializationTest {
-
-    @Test
-    fun testDummyJVM() {
-        doSerializeDeserializeAndCompareTest<K2JVMCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomFlagArgumentsJVM() {
-        doRandomFlagArgumentsTest<K2JVMCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomStringArgumentsJVM() {
-        doRandomStringArgumentsTest<K2JVMCompilerArguments>()
-    }
-
-    @Test
-    fun testLongClasspathArgumentJVM() {
-        doSerializeDeserializeAndCompareTest<K2JVMCompilerArguments> {
-            classpath = generateSequence { generateRandomString(50) }.take(10).toList().joinToString(File.pathSeparator)
-        }
-    }
-
-
-    @Test
-    fun testRandomArrayArgumentsJVM() {
-        doRandomArrayArgumentsTest<K2JVMCompilerArguments>()
-    }
-
-    @Test
-    fun testDummyJs() {
-        doSerializeDeserializeAndCompareTest<K2JSCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomFlagArgumentsJS() {
-        doRandomFlagArgumentsTest<K2JSCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomStringArgumentsJS() {
-        doRandomStringArgumentsTest<K2JSCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomArrayArgumentsJS() {
-        doRandomArrayArgumentsTest<K2JSCompilerArguments>()
-    }
-
-    @Test
-    fun testDummyMetadata() {
-        doSerializeDeserializeAndCompareTest<K2MetadataCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomFlagArgumentsMetadata() {
-        doRandomFlagArgumentsTest<K2MetadataCompilerArguments>()
-    }
-
-    @Test
-    fun testRandomStringArgumentsMetadata() {
-        doRandomStringArgumentsTest<K2MetadataCompilerArguments>()
-    }
-
-    @Test
-    fun testLongClasspathArgumentMetadata() {
-        doSerializeDeserializeAndCompareTest<K2MetadataCompilerArguments> {
-            classpath = generateSequence { generateRandomString(50) }.take(10).toList().joinToString(File.pathSeparator)
-        }
-    }
-
-    @Test
-    fun testRandomArrayArgumentsMetadata() {
-        doRandomArrayArgumentsTest<K2MetadataCompilerArguments>()
-    }
-
-
-    @Test
-    fun testDummyJsDce() {
-        doSerializeDeserializeAndCompareTest<K2JSDceArguments>()
-    }
-
-    @Test
-    fun testRandomFlagArgumentsJSDce() {
-        doRandomFlagArgumentsTest<K2JSDceArguments>()
-    }
-
-    @Test
-    fun testRandomStringArgumentsJSDce() {
-        doRandomStringArgumentsTest<K2JSDceArguments>()
-    }
-
-    @Test
-    fun testRandomArrayArgumentsJSDce() {
-        doRandomArrayArgumentsTest<K2JSDceArguments>()
-    }
-
-
-    private inline fun <reified T : CommonToolArguments> doSerializeDeserializeAndCompareTest(configure: T.() -> Unit = {}) {
-        val oldInstance = T::class.java.getConstructor().newInstance().apply(configure)
-        val serializer = CompilerArgumentsSerializerV5<T>(oldInstance)
-        val mockFacetElement = Element("ROOT")
-        val element = serializer.serializeTo(mockFacetElement)
-        val newInstance = T::class.java.getConstructor().newInstance()
-        val deserializer = CompilerArgumentsDeserializerV5(newInstance)
-        deserializer.deserializeFrom(element)
-        T::class.memberProperties.mapNotNull { it.safeAs<KProperty1<T, *>>() }.forEach {
-            val oldValue = it.get(oldInstance)
-            val newValue = it.get(newInstance)
-            if (oldValue == null && newValue == null) return@forEach
-            Assert.assertNotNull("Old value of property \"${it.name}\" is null but new is not", oldValue)
-            Assert.assertNotNull("New value of property \"${it.name}\" is null but old is not", newValue)
-
-            if ((it.returnType.classifier as? KClass<*>)?.java?.isArray == true)
-                Assert.assertArrayEquals(
-                    "Property ${it.name} has different values before (${it.get(oldInstance).toString()}) and after (${
-                        it.get(newInstance).toString()
-                    }) serialization",
-                    oldValue as Array<*>, newValue as Array<*>
-                )
-            else
-                assert(it.get(oldInstance) == it.get(newInstance)) {
-                    "Property ${it.name} has different values before (${it.get(oldInstance).toString()}) and after (${
-                        it.get(newInstance).toString()
-                    }) serialization"
-                }
-        }
-    }
-
-    private inline fun <reified T : CommonToolArguments> doRandomFlagArgumentsTest() {
-        val flagProperties = CompilerArgumentsContentProspector.getFlagCompilerArgumentProperties(T::class)
-        val randomFlags = generateSequence { Random.nextBoolean() }.take(flagProperties.size).toList()
-        doSerializeDeserializeAndCompareTest<T> {
-            flagProperties.zip(randomFlags).forEach {
-                it.first.cast<KMutableProperty1<T, Boolean>>().set(this, it.second)
-            }
-        }
-    }
-
-    private inline fun <reified T : CommonToolArguments> doRandomStringArgumentsTest() {
-        val stringProperties = CompilerArgumentsContentProspector.getStringCompilerArgumentProperties(T::class)
-        val randomStrings = generateSequence { generateRandomString(Random.nextInt(20)) }.take(stringProperties.size).toList()
-        doSerializeDeserializeAndCompareTest<T> {
-            stringProperties.zip(randomStrings).forEach {
-                it.first.cast<KMutableProperty1<T, String?>>().set(this, it.second)
-            }
-        }
-    }
-
-    private inline fun <reified T : CommonToolArguments> doRandomArrayArgumentsTest() {
-        val arrayProperties = CompilerArgumentsContentProspector.getArrayCompilerArgumentProperties(T::class)
-        val randomArrays = generateSequence {
-            generateSequence { generateRandomString(Random.nextInt(20)) }.take(Random.nextInt(10)).toList().toTypedArray()
-        }.take(arrayProperties.size).toList()
-        doSerializeDeserializeAndCompareTest<T> {
-            arrayProperties.zip(randomArrays).forEach {
-                it.first.cast<KMutableProperty1<T, Array<String>?>>().set(this, it.second)
-            }
-        }
-    }
-
-    companion object {
-        private val charPool: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-
-        private fun generateRandomString(length: Int) = generateSequence { Random.nextInt(0, charPool.size) }
-            .take(length)
-            .map(charPool::get)
-            .joinToString("")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml b/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
deleted file mode 100644
index ac46aeccb65d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/kotlin.jps-plugin.iml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/resources-en" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="library" scope="TEST" name="Guava" level="project" />
-    <orderEntry type="module" module-name="kotlin.common" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-build-common-tests" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinc.incremental-compilation-impl-tests" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.jps.build" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
-    <orderEntry type="library" name="ASM" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources-en/messages/KotlinJpsBundle.properties b/plugins/kotlin/jps/jps-plugin/resources-en/messages/KotlinJpsBundle.properties
deleted file mode 100644
index 3b78b95c8929..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources-en/messages/KotlinJpsBundle.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-compiler.text.experimental.bytecode.instrumentation.for.kotlin.classes.is.enabled=Experimental bytecode instrumentation for Kotlin classes is enabled
-compiler.text.incremental.caches.are.corrupted.all.kotlin.code.will.be.rebuilt=Incremental caches are corrupted. All Kotlin code will be rebuilt.
-compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.1.enable.delegate.ide.build.run.actions.to.gradle.in.settings={0} is not yet supported in IDEA internal build system. Please use Gradle to build {1} (enable ''Delegate IDE build/run actions to Gradle'' in Settings).
-compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.them.enable.delegate.ide.build.run.actions.to.gradle.in.settings={0} is not yet supported in IDEA internal build system.\nPlease use Gradle to build them (enable ''Delegate IDE build/run actions to Gradle'' in Settings).
-error.message.no.output.directory.found.for.0=No output directory found for {0}
-progress.text.compiling.0=compiling [{0}]
-error.text.cyclically.dependent.modules.are.not.supported.in.multiplatform.projects=Cyclically dependent modules are not supported in multiplatform projects
-info.text.kotlin.jps.plugin.is.disabled=Kotlin JPS plugin is disabled
-error.text.cyclically.dependent.modules.0.should.have.same.compiler=Cyclically dependent modules {0} should have same compiler.
-error.text.output.directory.not.specified.for.0=Output directory not specified for {0}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService b/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService
deleted file mode 100644
index 575f1f76edcd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.AdditionalRootsProviderService
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-org.jetbrains.kotlin.jps.build.KotlinSourceRootProvider
-org.jetbrains.kotlin.jps.build.KotlinResourcesRootProvider
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension b/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension
deleted file mode 100644
index 482b1a78258e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-org.jetbrains.kotlin.jps.build.KotlinJavaBuilderExtension
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker b/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker
deleted file mode 100644
index 5db53994ed44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.dependencyView.AnnotationsChangeTracker
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-org.jetbrains.jps.builders.java.dependencyView.NullabilityAnnotationsTracker
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
deleted file mode 100644
index 13b23fc26bcd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-org.jetbrains.kotlin.jps.build.KotlinBuilderService
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
deleted file mode 100644
index d165f4a638fb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-org.jetbrains.kotlin.jps.model.KotlinModelSerializerService
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/jps/builders/java/dependencyView/NullabilityAnnotationsTracker.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/jps/builders/java/dependencyView/NullabilityAnnotationsTracker.kt
deleted file mode 100644
index 5307910be5c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/jps/builders/java/dependencyView/NullabilityAnnotationsTracker.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.jps.builders.java.dependencyView
-
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet
-import org.jetbrains.jps.builders.java.dependencyView.TypeRepr.ClassType
-import org.jetbrains.kotlin.fileClasses.internalNameWithoutInnerClasses
-import org.jetbrains.kotlin.load.java.JAVAX_NONNULL_ANNOTATION
-import org.jetbrains.kotlin.load.java.NOT_NULL_ANNOTATIONS
-import org.jetbrains.kotlin.load.java.NULLABLE_ANNOTATIONS
-import java.util.*
-
-internal class NullabilityAnnotationsTracker : AnnotationsChangeTracker() {
-    private val annotations =
-        (NULLABLE_ANNOTATIONS + JAVAX_NONNULL_ANNOTATION + NOT_NULL_ANNOTATIONS).mapTo(HashSet()) { it.internalNameWithoutInnerClasses }
-            .toTypedArray()
-
-    override fun methodAnnotationsChanged(
-        context: NamingContext,
-        method: ProtoMethodEntity,
-        annotationsDiff: Difference.Specifier<ClassType, Difference>,
-        paramAnnotationsDiff: Difference.Specifier<ParamAnnotation, Difference>
-    ): Set<Recompile> {
-        val changedAnnotations = annotationsDiff.addedOrRemoved() +
-                paramAnnotationsDiff.addedOrRemoved().map { it.type }
-
-        return handleNullAnnotationsChanges(context, method, changedAnnotations)
-    }
-
-    override fun fieldAnnotationsChanged(
-        context: NamingContext,
-        field: ProtoFieldEntity,
-        annotationsDiff: Difference.Specifier<ClassType, Difference>
-    ): Set<Recompile> {
-        return handleNullAnnotationsChanges(context, field, annotationsDiff.addedOrRemoved())
-    }
-
-    private fun handleNullAnnotationsChanges(
-        context: NamingContext,
-        protoMember: ProtoEntity,
-        annotations: Sequence<TypeRepr.ClassType>
-    ): Set<Recompile> {
-        val n = this.annotations.size
-        val nullabilityAnnotations = IntOpenHashSet(n)
-        for (i in 0 until n) {
-            nullabilityAnnotations.add(context.get(this.annotations.get(i)))
-        }
-
-        val changedNullAnnotation = annotations.firstOrNull { nullabilityAnnotations.contains(it.className) }
-
-        val result = EnumSet.noneOf(Recompile::class.java)
-        if (changedNullAnnotation != null) {
-            result.add(Recompile.USAGES)
-
-            if (protoMember is ProtoMethodEntity && !protoMember.isFinal) {
-                // methods can be overridden, whereas fields cannot be
-                result.add(Recompile.SUBCLASSES)
-            }
-        }
-
-        return result
-    }
-
-    private fun <T> Difference.Specifier<T, Difference>.addedOrRemoved(): Sequence<T> =
-        added().asSequence() + removed().asSequence()
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
deleted file mode 100644
index 027b9481f5a1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import org.jetbrains.kotlin.idea.artifacts.KotlinClassPath
-import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
-import org.jetbrains.kotlin.preloading.Preloader
-import java.io.File
-import java.io.PrintStream
-import java.lang.ref.SoftReference
-import kotlin.io.path.Path
-import kotlin.io.path.exists
-import kotlin.io.path.name
-
-object CompilerRunnerUtil {
-    private var ourClassLoaderRef = SoftReference<ClassLoader>(null)
-
-    internal val jdkToolsJar: File?
-        get() {
-            val javaHomePath = System.getProperty("java.home")
-            if (javaHomePath == null || javaHomePath.isEmpty()) {
-                return null
-            }
-            val javaHome = Path(javaHomePath)
-            var toolsJar = javaHome.resolve("lib/tools.jar")
-            if (toolsJar.exists()) {
-                return toolsJar.toFile()
-            }
-
-            // We might be inside jre.
-            if (javaHome.name == "jre") {
-                toolsJar = javaHome.resolveSibling("lib/tools.jar")
-                if (toolsJar.exists()) {
-                    return toolsJar.toFile()
-                }
-            }
-
-            return null
-        }
-
-    @Synchronized
-    private fun getOrCreateClassLoader(
-        environment: JpsCompilerEnvironment,
-        paths: List<File>
-    ): ClassLoader {
-        var classLoader = ourClassLoaderRef.get()
-        if (classLoader == null) {
-            classLoader = ClassPreloadingUtils.preloadClasses(
-                paths,
-                Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE,
-                CompilerRunnerUtil::class.java.classLoader,
-                environment.classesToLoadByParent
-            )
-            ourClassLoaderRef = SoftReference(classLoader)
-        }
-        return classLoader!!
-    }
-
-    fun invokeExecMethod(
-        compilerClassName: String,
-        arguments: Array<String>,
-        environment: JpsCompilerEnvironment,
-        out: PrintStream
-    ): Any? = withCompilerClassloader(environment) { classLoader ->
-        val compiler = Class.forName(compilerClassName, true, classLoader)
-        val exec = compiler.getMethod(
-            "execAndOutputXml",
-            PrintStream::class.java,
-            Class.forName("org.jetbrains.kotlin.config.Services", true, classLoader),
-            Array<String>::class.java
-        )
-        exec.invoke(compiler.newInstance(), out, environment.services, arguments)
-    }
-
-    fun invokeClassesFqNames(
-        environment: JpsCompilerEnvironment,
-        files: Set<File>
-    ): Set<String> = withCompilerClassloader(environment) { classLoader ->
-        val klass = Class.forName("org.jetbrains.kotlin.incremental.parsing.ParseFileUtilsKt", true, classLoader)
-        val method = klass.getMethod("classesFqNames", Set::class.java)
-        @Suppress("UNCHECKED_CAST")
-        method.invoke(klass, files) as? Set<String>
-    } ?: emptySet()
-
-    private fun <T> withCompilerClassloader(
-        environment: JpsCompilerEnvironment,
-        fn: (ClassLoader) -> T
-    ): T? {
-        val paths = KotlinClassPath.CompilerWithScripting.computeClassPath().let { classPath ->
-            jdkToolsJar?.let { classPath + it } ?: classPath
-        }
-
-        val classLoader = getOrCreateClassLoader(environment, paths)
-        return fn(classLoader)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt
deleted file mode 100644
index 4ef116ad1e5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.preloading.ClassCondition
-import org.jetbrains.kotlin.utils.KotlinPaths
-
-class JpsCompilerEnvironment(
-    services: Services,
-    val classesToLoadByParent: ClassCondition,
-    messageCollector: MessageCollector,
-    outputItemsCollector: OutputItemsCollectorImpl,
-    val progressReporter: ProgressReporter
-) : CompilerEnvironment(services, messageCollector, outputItemsCollector) {
-    override val outputItemsCollector: OutputItemsCollectorImpl
-        get() = super.outputItemsCollector as OutputItemsCollectorImpl
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
deleted file mode 100644
index 129f61bacab0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer
-import org.jetbrains.kotlin.daemon.client.reportFromDaemon
-import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade
-import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
-import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
-import org.jetbrains.kotlin.incremental.components.InlineConstTracker
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
-import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
-import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
-import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import java.io.Serializable
-
-internal class JpsCompilerServicesFacadeImpl(
-    private val env: JpsCompilerEnvironment,
-    port: Int = SOCKET_ANY_FREE_PORT
-) : CompilerCallbackServicesFacadeServer(
-    env.services[IncrementalCompilationComponents::class.java],
-    env.services[LookupTracker::class.java],
-    env.services[CompilationCanceledStatus::class.java],
-    env.services[ExpectActualTracker::class.java],
-    env.services[InlineConstTracker::class.java],
-    env.services[IncrementalResultsConsumer::class.java],
-    env.services[IncrementalDataProvider::class.java],
-    port
-), JpsCompilerServicesFacade {
-
-    override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) {
-        env.messageCollector.reportFromDaemon(
-            { outFile, srcFiles -> env.outputItemsCollector.add(srcFiles, outFile) },
-            category, severity, message, attachment
-        )
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
deleted file mode 100644
index c828c7b2fb8b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import com.intellij.util.xmlb.XmlSerializerUtil
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.jps.api.GlobalOptions
-import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
-import org.jetbrains.kotlin.cli.common.ExitCode
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil
-import org.jetbrains.kotlin.config.CompilerSettings
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.config.additionalArgumentsAsList
-import org.jetbrains.kotlin.daemon.client.CompileServiceSession
-import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient
-import org.jetbrains.kotlin.daemon.common.*
-import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.jps.build.KotlinBuilder
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.PrintStream
-
-class JpsKotlinCompilerRunner {
-    private val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG)
-
-    private var compilerSettings: CompilerSettings? = null
-
-    private inline fun withCompilerSettings(settings: CompilerSettings, fn: () -> Unit) {
-        val old = compilerSettings
-        try {
-            compilerSettings = settings
-            fn()
-        } finally {
-            compilerSettings = old
-        }
-    }
-
-    companion object {
-        @Volatile
-        private var _jpsCompileServiceSession: CompileServiceSession? = null
-
-        @TestOnly
-        fun shutdownDaemon() {
-            _jpsCompileServiceSession?.let {
-                try {
-                    it.compileService.shutdown()
-                } catch (_: Throwable) {
-                }
-            }
-            _jpsCompileServiceSession = null
-        }
-
-        fun releaseCompileServiceSession() {
-            _jpsCompileServiceSession?.let {
-                try {
-                    it.compileService.releaseCompileSession(it.sessionId)
-                } catch (_: Throwable) {
-                }
-            }
-            _jpsCompileServiceSession = null
-        }
-
-        @Synchronized
-        private fun getOrCreateDaemonConnection(newConnection: () -> CompileServiceSession?): CompileServiceSession? {
-            // TODO: consider adding state "ping" to the daemon interface
-            if (_jpsCompileServiceSession == null || _jpsCompileServiceSession!!.compileService.getDaemonOptions() !is CompileService.CallResult.Good<DaemonOptions>) {
-                releaseCompileServiceSession()
-                _jpsCompileServiceSession = newConnection()
-            }
-
-            return _jpsCompileServiceSession
-        }
-
-        const val FAIL_ON_FALLBACK_PROPERTY = "test.kotlin.jps.compiler.runner.fail.on.fallback"
-    }
-
-    fun classesFqNamesByFiles(
-        environment: JpsCompilerEnvironment,
-        files: Set<File>
-    ): Set<String> = withDaemonOrFallback(
-        withDaemon = {
-            doWithDaemon(environment) { sessionId, daemon ->
-                daemon.classesFqNamesByFiles(
-                    sessionId,
-                    files.toSet() // convert to standard HashSet to avoid serialization issues
-                )
-            }
-        },
-        fallback = {
-            CompilerRunnerUtil.invokeClassesFqNames(environment, files)
-        }
-    )
-
-    fun runK2MetadataCompiler(
-        commonArguments: CommonCompilerArguments,
-        k2MetadataArguments: K2MetadataCompilerArguments,
-        compilerSettings: CompilerSettings,
-        environment: JpsCompilerEnvironment,
-        destination: String,
-        classpath: Collection<String>,
-        sourceFiles: Collection<File>
-    ) {
-        val arguments = mergeBeans(commonArguments, XmlSerializerUtil.createCopy(k2MetadataArguments))
-
-        val classpathSet = arguments.classpath?.split(File.pathSeparator)?.toMutableSet() ?: mutableSetOf()
-        classpathSet.addAll(classpath)
-        arguments.classpath = classpath.joinToString(File.pathSeparator)
-        arguments.freeArgs = sourceFiles.map { it.absolutePath }
-        arguments.destination = arguments.destination ?: destination
-
-        withCompilerSettings(compilerSettings) {
-            runCompiler(KotlinCompilerClass.METADATA, arguments, environment)
-        }
-    }
-
-    fun runK2JvmCompiler(
-        commonArguments: CommonCompilerArguments,
-        k2jvmArguments: K2JVMCompilerArguments,
-        compilerSettings: CompilerSettings,
-        environment: JpsCompilerEnvironment,
-        moduleFile: File
-    ) {
-        val arguments = mergeBeans(commonArguments, XmlSerializerUtil.createCopy(k2jvmArguments))
-        setupK2JvmArguments(moduleFile, arguments)
-        withCompilerSettings(compilerSettings) {
-            runCompiler(KotlinCompilerClass.JVM, arguments, environment)
-        }
-    }
-
-    fun runK2JsCompiler(
-        commonArguments: CommonCompilerArguments,
-        k2jsArguments: K2JSCompilerArguments,
-        compilerSettings: CompilerSettings,
-        environment: JpsCompilerEnvironment,
-        allSourceFiles: Collection<File>,
-        commonSources: Collection<File>,
-        sourceMapRoots: Collection<File>,
-        libraries: List<String>,
-        friendModules: List<String>,
-        outputFile: File
-    ) {
-        log.debug("K2JS: common arguments: " + ArgumentUtils.convertArgumentsToStringList(commonArguments))
-        log.debug("K2JS: JS arguments: " + ArgumentUtils.convertArgumentsToStringList(k2jsArguments))
-
-        val arguments = mergeBeans(commonArguments, XmlSerializerUtil.createCopy(k2jsArguments))
-        log.debug("K2JS: merged arguments: " + ArgumentUtils.convertArgumentsToStringList(arguments))
-
-        setupK2JsArguments(outputFile, allSourceFiles, commonSources, libraries, friendModules, arguments)
-        if (arguments.sourceMap) {
-            arguments.sourceMapBaseDirs = sourceMapRoots.joinToString(File.pathSeparator) { it.path }
-        }
-
-        log.debug("K2JS: arguments after setup" + ArgumentUtils.convertArgumentsToStringList(arguments))
-
-        withCompilerSettings(compilerSettings) {
-            runCompiler(KotlinCompilerClass.JS, arguments, environment)
-        }
-    }
-
-    private fun compileWithDaemonOrFallback(
-        compilerClassName: String,
-        compilerArgs: CommonCompilerArguments,
-        environment: JpsCompilerEnvironment
-    ) {
-        log.debug("Using kotlin-home = " + KotlinArtifacts.instance.kotlincDirectory)
-
-        withDaemonOrFallback(
-            withDaemon = { compileWithDaemon(compilerClassName, compilerArgs, environment) },
-            fallback = { fallbackCompileStrategy(compilerArgs, compilerClassName, environment) }
-        )
-    }
-
-    private fun runCompiler(compilerClassName: String, compilerArgs: CommonCompilerArguments, environment: JpsCompilerEnvironment) {
-        try {
-            compileWithDaemonOrFallback(compilerClassName, compilerArgs, environment)
-        } catch (e: Throwable) {
-            MessageCollectorUtil.reportException(environment.messageCollector, e)
-            reportInternalCompilerError(environment.messageCollector)
-        }
-    }
-
-    private fun compileWithDaemon(
-        compilerClassName: String,
-        compilerArgs: CommonCompilerArguments,
-        environment: JpsCompilerEnvironment
-    ): Int? {
-        val targetPlatform = when (compilerClassName) {
-            KotlinCompilerClass.JVM -> CompileService.TargetPlatform.JVM
-            KotlinCompilerClass.JS -> CompileService.TargetPlatform.JS
-            KotlinCompilerClass.METADATA -> CompileService.TargetPlatform.METADATA
-            else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName")
-        }
-        val compilerMode = CompilerMode.JPS_COMPILER
-        val verbose = compilerArgs.verbose
-        val options = CompilationOptions(
-            compilerMode,
-            targetPlatform,
-            reportCategories(verbose),
-            reportSeverity(verbose),
-            requestedCompilationResults = emptyArray()
-        )
-        return doWithDaemon(environment) { sessionId, daemon ->
-            environment.withProgressReporter { progress ->
-                progress.compilationStarted()
-                daemon.compile(
-                    sessionId,
-                    withAdditionalCompilerArgs(compilerArgs),
-                    options,
-                    JpsCompilerServicesFacadeImpl(environment),
-                    null
-                )
-            }
-        }
-    }
-
-    private fun <T> withDaemonOrFallback(withDaemon: () -> T?, fallback: () -> T): T =
-        if (isDaemonEnabled()) {
-            withDaemon() ?: fallback()
-        } else {
-            fallback()
-        }
-
-    private fun <T> doWithDaemon(
-        environment: JpsCompilerEnvironment,
-        fn: (sessionId: Int, daemon: CompileService) -> CompileService.CallResult<T>
-    ): T? {
-        log.debug("Try to connect to daemon")
-        val connection = getDaemonConnection(environment)
-        if (connection == null) {
-            log.info("Could not connect to daemon")
-            return null
-        }
-
-        val (daemon, sessionId) = connection
-        val res = fn(sessionId, daemon)
-        // TODO: consider implementing connection retry, instead of fallback here
-        return res.takeUnless { it is CompileService.CallResult.Dying }?.get()
-    }
-
-    private fun withAdditionalCompilerArgs(compilerArgs: CommonCompilerArguments): Array<String> {
-        val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) +
-                (compilerSettings?.additionalArgumentsAsList ?: emptyList())
-        return allArgs.toTypedArray()
-    }
-
-    private fun reportCategories(verbose: Boolean): Array<Int> {
-        val categories =
-            if (!verbose) {
-                arrayOf(ReportCategory.COMPILER_MESSAGE, ReportCategory.EXCEPTION)
-            } else {
-                ReportCategory.values()
-            }
-
-        return categories.map { it.code }.toTypedArray()
-    }
-
-
-    private fun reportSeverity(verbose: Boolean): Int =
-        if (!verbose) {
-            ReportSeverity.INFO.code
-        } else {
-            ReportSeverity.DEBUG.code
-        }
-
-    private fun fallbackCompileStrategy(
-        compilerArgs: CommonCompilerArguments,
-        compilerClassName: String,
-        environment: JpsCompilerEnvironment
-    ) {
-        if ("true" == System.getProperty("kotlin.jps.tests") && "true" == System.getProperty(FAIL_ON_FALLBACK_PROPERTY)) {
-            error("Cannot compile with Daemon, see logs bellow. Fallback strategy is disabled in tests")
-        }
-
-        // otherwise fallback to in-process
-        log.info("Compile in-process")
-
-        val stream = ByteArrayOutputStream()
-        val out = PrintStream(stream)
-
-        // the property should be set at least for parallel builds to avoid parallel building problems (racing between destroying and using environment)
-        // unfortunately it cannot be currently set by default globally, because it breaks many tests
-        // since there is no reliable way so far to detect running under tests, switching it on only for parallel builds
-        if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean())
-            CompilerSystemProperties.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY.value = "true"
-
-        val rc = environment.withProgressReporter { progress ->
-            progress.compilationStarted()
-            CompilerRunnerUtil.invokeExecMethod(compilerClassName, withAdditionalCompilerArgs(compilerArgs), environment, out)
-        }
-
-        // exec() returns an ExitCode object, class of which is loaded with a different class loader,
-        // so we take it's contents through reflection
-        val exitCode = ExitCode.valueOf(getReturnCodeFromObject(rc))
-        processCompilerOutput(environment.messageCollector, environment.outputItemsCollector, stream, exitCode)
-    }
-
-    private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) {
-        with(settings) {
-            buildFile = moduleFile.absolutePath
-            destination = null
-            noStdlib = true
-            noReflect = true
-            noJdk = true
-        }
-    }
-
-    private fun setupK2JsArguments(
-        _outputFile: File,
-        allSourceFiles: Collection<File>,
-        _commonSources: Collection<File>,
-        _libraries: List<String>,
-        _friendModules: List<String>,
-        settings: K2JSCompilerArguments
-    ) {
-        with(settings) {
-            noStdlib = true
-            freeArgs = allSourceFiles.map { it.path }.toMutableList()
-            commonSources = _commonSources.map { it.path }.toTypedArray()
-            outputFile = _outputFile.path
-            metaInfo = true
-            libraries = _libraries.joinToString(File.pathSeparator)
-            friendModules = _friendModules.joinToString(File.pathSeparator)
-        }
-    }
-
-    private fun getReturnCodeFromObject(rc: Any?): String = when {
-        rc == null -> ExitCode.INTERNAL_ERROR.toString()
-        ExitCode::class.java.name == rc::class.java.name -> rc.toString()
-        else -> throw IllegalStateException("Unexpected return: " + rc)
-    }
-
-    private fun getDaemonConnection(environment: JpsCompilerEnvironment): CompileServiceSession? =
-        getOrCreateDaemonConnection {
-            environment.progressReporter.progress("connecting to daemon")
-            val compilerPath = KotlinArtifacts.instance.kotlinCompiler
-            val daemonJarPath = KotlinArtifacts.instance.kotlinDaemon
-            val toolsJarPath = CompilerRunnerUtil.jdkToolsJar
-            val compilerId = CompilerId.makeCompilerId(listOfNotNull(compilerPath, toolsJarPath, daemonJarPath))
-            val daemonOptions = configureDaemonOptions()
-            val additionalJvmParams = mutableListOf<String>()
-
-            IncrementalCompilation.toJvmArgs(additionalJvmParams)
-
-            val clientFlagFile = KotlinCompilerClient.getOrCreateClientFlagFile(daemonOptions)
-            val sessionFlagFile = makeAutodeletingFlagFile("compiler-jps-session-", File(daemonOptions.runFilesPathOrDefault))
-
-            environment.withProgressReporter { progress ->
-                progress.progress("connecting to daemon")
-                KotlinCompilerRunnerUtils.newDaemonConnection(
-                    compilerId,
-                    clientFlagFile,
-                    sessionFlagFile,
-                    environment.messageCollector,
-                    log.isDebugEnabled,
-                    daemonOptions,
-                    additionalJvmParams.toTypedArray()
-                )
-            }
-        }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt
deleted file mode 100644
index 80b4302a8ccc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import com.intellij.openapi.diagnostic.Logger
-
-internal class JpsKotlinLogger(private val log: Logger) : KotlinLogger {
-    override fun error(msg: String) {
-        log.error(msg)
-    }
-
-    override fun warn(msg: String) {
-        log.warn(msg)
-    }
-
-    override fun info(msg: String) {
-        log.info(msg)
-    }
-
-    override fun debug(msg: String) {
-        log.debug(msg)
-    }
-
-    override val isDebugEnabled: Boolean
-        get() = log.isDebugEnabled
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ProgressReporter.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ProgressReporter.kt
deleted file mode 100644
index 834702a2cccc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ProgressReporter.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.compilerRunner
-
-import org.jetbrains.annotations.Nls
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.messages.ProgressMessage
-import org.jetbrains.kotlin.jps.KotlinJpsBundle
-
-interface ProgressReporter {
-    fun progress(message: String)
-    fun compilationStarted()
-    fun clearProgress()
-}
-
-class ProgressReporterImpl(private val context: CompileContext, private val chunk: ModuleChunk) : ProgressReporter {
-    override fun progress(@Nls message: String) {
-        @Suppress("HardCodedStringLiteral")
-        context.processMessage(ProgressMessage("Kotlin: $message"))
-    }
-
-    override fun compilationStarted() {
-        progress(KotlinJpsBundle.message("progress.text.compiling.0", chunk.presentableShortName))
-    }
-
-    override fun clearProgress() {
-        context.processMessage(ProgressMessage(""))
-    }
-
-}
-
-inline fun <T> JpsCompilerEnvironment.withProgressReporter(fn: (ProgressReporter) -> T): T =
-    try {
-        fn(progressReporter)
-    } finally {
-        progressReporter.clearProgress()
-    }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt
deleted file mode 100644
index a6a3619c3891..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/KotlinJpsBundle.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.jps
-
-import com.intellij.DynamicBundle
-import org.jetbrains.annotations.Nls
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-
-@NonNls
-private const val BUNDLE = "messages.KotlinJpsBundle"
-
-object KotlinJpsBundle : DynamicBundle(BUNDLE) {
-    @Nls
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-
-    @Nls
-    @JvmStatic
-    fun lazyMessage(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { getMessage(key, *params) }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt
deleted file mode 100644
index 1b7009f0f561..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.BuildRootDescriptor
-import org.jetbrains.jps.builders.BuildTarget
-import org.jetbrains.jps.builders.FileProcessor
-import org.jetbrains.jps.builders.impl.DirtyFilesHolderBase
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.builders.java.dependencyView.Mappings
-import org.jetbrains.jps.incremental.BuildOperations
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.FSOperations
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.fs.CompilationRound
-import java.io.File
-import java.util.HashMap
-import kotlin.collections.*
-
-/**
- * Entry point for safely marking files as dirty.
- */
-class FSOperationsHelper(
-    private val compileContext: CompileContext,
-    private val chunk: ModuleChunk,
-    private val dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-    private val log: Logger
-) {
-    private val moduleBasedFilter = ModulesBasedFileFilter(compileContext, chunk)
-
-    internal var hasMarkedDirty = false
-        private set
-
-    private val buildLogger = compileContext.testingContext?.buildLogger
-
-    fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set<File> = setOf()) {
-        fun shouldMark(file: File): Boolean {
-            if (kotlinOnly && !file.isKotlinSourceFile) return false
-
-            if (file in excludeFiles) return false
-
-            hasMarkedDirty = true
-            return true
-        }
-
-        if (recursively) {
-            FSOperations.markDirtyRecursively(compileContext, CompilationRound.NEXT, chunk, ::shouldMark)
-        } else {
-            FSOperations.markDirty(compileContext, CompilationRound.NEXT, chunk, ::shouldMark)
-        }
-    }
-
-    internal fun markFilesForCurrentRound(files: Iterable<File>) {
-        files.forEach {
-            val root = compileContext.projectDescriptor.buildRootIndex.findJavaRootDescriptor(compileContext, it)
-            if (root != null) dirtyFilesHolder.byTarget[root.target]?._markDirty(it, root)
-        }
-
-        markFilesImpl(files, currentRound = true) { it.exists() && moduleBasedFilter.accept(it) }
-    }
-
-    /**
-     * Marks given [files] as dirty for current round and given [target] of [chunk].
-     */
-    fun markFilesForCurrentRound(target: ModuleBuildTarget, files: Collection<File>) {
-        require(target in chunk.targets)
-
-        val targetDirtyFiles = dirtyFilesHolder.byTarget.getValue(target)
-        val dirtyFileToRoot = HashMap<File, JavaSourceRootDescriptor>()
-        files.forEach { file ->
-            val root = compileContext.projectDescriptor.buildRootIndex
-                .findAllParentDescriptors<BuildRootDescriptor>(file, compileContext)
-                .single { sourceRoot -> sourceRoot.target == target }
-
-            targetDirtyFiles._markDirty(file, root as JavaSourceRootDescriptor)
-            dirtyFileToRoot[file] = root
-        }
-
-        markFilesImpl(files, currentRound = true) { it.exists() }
-        cleanOutputsForNewDirtyFilesInCurrentRound(target, dirtyFileToRoot)
-    }
-
-    private fun cleanOutputsForNewDirtyFilesInCurrentRound(target: ModuleBuildTarget, dirtyFiles: Map<File, JavaSourceRootDescriptor>) {
-        val dirtyFilesHolder = object : DirtyFilesHolderBase<JavaSourceRootDescriptor, ModuleBuildTarget>(compileContext) {
-            override fun processDirtyFiles(processor: FileProcessor<JavaSourceRootDescriptor, ModuleBuildTarget>) {
-                dirtyFiles.forEach { (file, root) -> processor.apply(target, file, root) }
-            }
-
-            override fun hasDirtyFiles(): Boolean = dirtyFiles.isNotEmpty()
-        }
-        BuildOperations.cleanOutputsCorrespondingToChangedFiles(compileContext, dirtyFilesHolder)
-    }
-
-    fun markFiles(files: Iterable<File>) {
-        markFilesImpl(files, currentRound = false) { it.exists() }
-    }
-
-    fun markInChunkOrDependents(files: Iterable<File>, excludeFiles: Set<File>) {
-        markFilesImpl(files, currentRound = false) {
-            it !in excludeFiles && it.exists() && moduleBasedFilter.accept(it)
-        }
-    }
-
-    private inline fun markFilesImpl(
-        files: Iterable<File>,
-        currentRound: Boolean,
-        shouldMark: (File) -> Boolean
-    ) {
-        val filesToMark = files.filterTo(HashSet(), shouldMark)
-        if (filesToMark.isEmpty()) return
-
-        val compilationRound = if (currentRound) {
-            buildLogger?.markedAsDirtyBeforeRound(filesToMark)
-            CompilationRound.CURRENT
-        } else {
-            buildLogger?.markedAsDirtyAfterRound(filesToMark)
-            hasMarkedDirty = true
-            CompilationRound.NEXT
-        }
-
-        for (fileToMark in filesToMark) {
-            FSOperations.markDirty(compileContext, compilationRound, fileToMark)
-        }
-        log.debug("Mark dirty: $filesToMark ($compilationRound)")
-    }
-
-    // Based on `JavaBuilderUtil#ModulesBasedFileFilter` from Intellij
-    private class ModulesBasedFileFilter(
-        private val context: CompileContext,
-        chunk: ModuleChunk
-    ) : Mappings.DependentFilesFilter {
-        private val chunkTargets = chunk.targets
-        private val buildRootIndex = context.projectDescriptor.buildRootIndex
-        private val buildTargetIndex = context.projectDescriptor.buildTargetIndex
-        private val cache = HashMap<BuildTarget<*>, Set<BuildTarget<*>>>()
-
-        override fun accept(file: File): Boolean {
-            val rd = buildRootIndex.findJavaRootDescriptor(context, file) ?: return true
-            val target = rd.target
-            if (target in chunkTargets) return true
-
-            val targetOfFileWithDependencies = cache.getOrPut(target) { buildTargetIndex.getDependenciesRecursively(target, context) }
-            return ContainerUtil.intersects(targetOfFileWithDependencies, chunkTargets)
-        }
-
-        override fun belongsToCurrentTargetChunk(file: File): Boolean {
-            val rd = buildRootIndex.findJavaRootDescriptor(context, file)
-            return rd != null && chunkTargets.contains(rd.target)
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt
deleted file mode 100644
index dd0090bb1f3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsFileToPathConverter.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
-import org.jetbrains.kotlin.incremental.storage.RelativeFileToPathConverter
-
-internal class JpsFileToPathConverter(
-    jpsProject: JpsProject
-) : RelativeFileToPathConverter(JpsModelSerializationDataService.getBaseDirectory(jpsProject))
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
deleted file mode 100644
index 6b3f118edbc4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ /dev/null
@@ -1,777 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.NlsSafe
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.DirtyFilesHolder
-import org.jetbrains.jps.builders.FileProcessor
-import org.jetbrains.jps.builders.impl.DirtyFilesHolderBase
-import org.jetbrains.jps.builders.java.JavaBuilderUtil
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.builders.storage.BuildDataCorruptedException
-import org.jetbrains.jps.incremental.*
-import org.jetbrains.jps.incremental.BuildOperations.deleteRecursively
-import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.*
-import org.jetbrains.jps.incremental.java.JavaBuilder
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.kotlin.build.GeneratedFile
-import org.jetbrains.kotlin.build.GeneratedJvmClass
-import org.jetbrains.kotlin.cli.common.ExitCode
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
-import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil
-import org.jetbrains.kotlin.compilerRunner.*
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.config.KotlinModuleKind
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
-import org.jetbrains.kotlin.incremental.*
-import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.build.report.ICReporterBase
-import org.jetbrains.kotlin.incremental.components.InlineConstTracker
-import org.jetbrains.kotlin.jps.KotlinJpsBundle
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager
-import org.jetbrains.kotlin.jps.model.kotlinKind
-import org.jetbrains.kotlin.jps.targets.KotlinJvmModuleBuildTarget
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.preloading.ClassCondition
-import java.io.File
-import java.util.*
-import kotlin.collections.HashSet
-import kotlin.system.measureTimeMillis
-
-class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
-    companion object {
-        @NlsSafe
-        const val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
-
-        val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder")
-        const val SKIP_CACHE_VERSION_CHECK_PROPERTY = "kotlin.jps.skip.cache.version.check"
-        const val JPS_KOTLIN_HOME_PROPERTY = "jps.kotlin.home"
-
-        private val classesToLoadByParentFromRegistry =
-            System.getProperty("kotlin.jps.classesToLoadByParent")?.split(',')?.map { it.trim() } ?: emptyList()
-        private val classPrefixesToLoadByParentFromRegistry =
-            System.getProperty("kotlin.jps.classPrefixesToLoadByParent")?.split(',')?.map { it.trim() } ?: emptyList()
-
-        val classesToLoadByParent: ClassCondition
-            get() = ClassCondition { className ->
-                val prefixes = listOf(
-                    "org.apache.log4j.", // For logging from compiler
-                    "org.jetbrains.kotlin.incremental.components.",
-                    "org.jetbrains.kotlin.incremental.js",
-                    "org.jetbrains.kotlin.load.kotlin.incremental.components."
-                ) + classPrefixesToLoadByParentFromRegistry
-
-                val classes = listOf(
-                    "org.jetbrains.kotlin.config.Services",
-                    "org.jetbrains.kotlin.progress.CompilationCanceledStatus",
-                    "org.jetbrains.kotlin.progress.CompilationCanceledException",
-                    "org.jetbrains.kotlin.modules.TargetId",
-                    "org.jetbrains.kotlin.cli.common.ExitCode"
-                ) + classesToLoadByParentFromRegistry
-
-                prefixes.forEach { if (className.startsWith(it)) return@ClassCondition true }
-                classes.forEach { if (className == it) return@ClassCondition true }
-
-                return@ClassCondition false
-            }
-    }
-
-    private val statisticsLogger = TeamcityStatisticsLogger()
-
-    override fun getPresentableName() = KOTLIN_BUILDER_NAME
-
-    override fun getCompilableFileExtensions() = arrayListOf("kt", "kts")
-
-    override fun buildStarted(context: CompileContext) {
-        logSettings(context)
-    }
-
-    private fun logSettings(context: CompileContext) {
-        LOG.debug("==========================================")
-        LOG.info("is Kotlin incremental compilation enabled for JVM: ${IncrementalCompilation.isEnabledForJvm()}")
-        LOG.info("is Kotlin incremental compilation enabled for JS: ${IncrementalCompilation.isEnabledForJs()}")
-        LOG.info("is Kotlin compiler daemon enabled: ${isDaemonEnabled()}")
-
-        val historyLabel = context.getBuilderParameter("history label")
-        if (historyLabel != null) {
-            LOG.info("Label in local history: $historyLabel")
-        }
-    }
-
-    /**
-     * Ensure Kotlin Context initialized.
-     * Kotlin Context should be initialized only when required (before first kotlin chunk build).
-     */
-    private fun ensureKotlinContextInitialized(context: CompileContext): KotlinCompileContext {
-        val kotlinCompileContext = context.getUserData(kotlinCompileContextKey)
-        if (kotlinCompileContext != null) return kotlinCompileContext
-
-        // don't synchronize on context, since it is chunk local only
-        synchronized(kotlinCompileContextKey) {
-            val actualKotlinCompileContext = context.getUserData(kotlinCompileContextKey)
-            if (actualKotlinCompileContext != null) return actualKotlinCompileContext
-
-            try {
-                return initializeKotlinContext(context)
-            } catch (t: Throwable) {
-                jpsReportInternalBuilderError(context, Error("Cannot initialize Kotlin context: ${t.message}", t))
-                throw t
-            }
-        }
-    }
-
-    private fun initializeKotlinContext(context: CompileContext): KotlinCompileContext {
-        lateinit var kotlinContext: KotlinCompileContext
-
-        val time = measureTimeMillis {
-            kotlinContext = KotlinCompileContext(context)
-
-            context.putUserData(kotlinCompileContextKey, kotlinContext)
-            context.testingContext?.kotlinCompileContext = kotlinContext
-
-            if (kotlinContext.shouldCheckCacheVersions && kotlinContext.hasKotlin()) {
-                kotlinContext.checkCacheVersions()
-            }
-
-            kotlinContext.cleanupCaches()
-            kotlinContext.reportUnsupportedTargets()
-        }
-
-        LOG.info("Total Kotlin global compile context initialization time: $time ms")
-
-        return kotlinContext
-    }
-
-    override fun buildFinished(context: CompileContext) {
-        ensureKotlinContextDisposed(context)
-    }
-
-    private fun ensureKotlinContextDisposed(context: CompileContext) {
-        if (context.getUserData(kotlinCompileContextKey) != null) {
-            // don't synchronize on context, since it chunk local only
-            synchronized(kotlinCompileContextKey) {
-                val kotlinCompileContext = context.getUserData(kotlinCompileContextKey)
-                if (kotlinCompileContext != null) {
-                    kotlinCompileContext.dispose()
-                    context.putUserData(kotlinCompileContextKey, null)
-
-                    statisticsLogger.reportTotal()
-                }
-            }
-        }
-    }
-
-    override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {
-        super.chunkBuildStarted(context, chunk)
-
-        if (chunk.isDummy(context)) return
-
-        val kotlinContext = ensureKotlinContextInitialized(context)
-
-        val buildLogger = context.testingContext?.buildLogger
-        buildLogger?.chunkBuildStarted(context, chunk)
-
-        if (JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)) return
-
-        val targets = chunk.targets
-        if (targets.none { kotlinContext.hasKotlinMarker[it] == true }) return
-
-        val kotlinChunk = kotlinContext.getChunk(chunk) ?: return
-        kotlinContext.checkChunkCacheVersion(kotlinChunk)
-
-        if (!kotlinContext.rebuildingAllKotlin && kotlinChunk.isEnabled) {
-            markAdditionalFilesForInitialRound(kotlinChunk, chunk, kotlinContext)
-        }
-
-        buildLogger?.afterChunkBuildStarted(context, chunk)
-    }
-
-    /**
-     * Invalidate usages of removed classes.
-     * See KT-13677 for more details.
-     *
-     * todo(1.2.80): move to KotlinChunk
-     * todo(1.2.80): got rid of jpsGlobalContext usages (replace with KotlinCompileContext)
-     */
-    private fun markAdditionalFilesForInitialRound(
-        kotlinChunk: KotlinChunk,
-        chunk: ModuleChunk,
-        kotlinContext: KotlinCompileContext
-    ) {
-        val context = kotlinContext.jpsContext
-        val dirtyFilesHolder = KotlinDirtySourceFilesHolder(
-            chunk,
-            context,
-            object : DirtyFilesHolderBase<JavaSourceRootDescriptor, ModuleBuildTarget>(context) {
-                override fun processDirtyFiles(processor: FileProcessor<JavaSourceRootDescriptor, ModuleBuildTarget>) {
-                    FSOperations.processFilesToRecompile(context, chunk, processor)
-                }
-            }
-        )
-        val fsOperations = FSOperationsHelper(context, chunk, dirtyFilesHolder, LOG)
-
-        val representativeTarget = kotlinContext.targetsBinding[chunk.representativeTarget()] ?: return
-
-        // dependent caches are not required, since we are not going to update caches
-        val incrementalCaches = kotlinChunk.loadCaches(loadDependent = false)
-
-        val messageCollector = MessageCollectorAdapter(context, representativeTarget)
-        val environment = createCompileEnvironment(
-            kotlinContext.jpsContext,
-            representativeTarget,
-            incrementalCaches,
-            LookupTracker.DO_NOTHING,
-            ExpectActualTracker.DoNothing,
-            InlineConstTracker.DoNothing,
-            chunk,
-            messageCollector
-        )
-
-        val removedClasses = HashSet<String>()
-        for (target in kotlinChunk.targets) {
-            val cache = incrementalCaches[target] ?: continue
-            val dirtyFiles = dirtyFilesHolder.getDirtyFiles(target.jpsModuleBuildTarget).keys
-            val removedFiles = dirtyFilesHolder.getRemovedFiles(target.jpsModuleBuildTarget)
-
-            val existingClasses = JpsKotlinCompilerRunner().classesFqNamesByFiles(environment, dirtyFiles)
-            val previousClasses = cache.classesFqNamesBySources(dirtyFiles + removedFiles)
-            for (jvmClassName in previousClasses) {
-                val fqName = jvmClassName.asString()
-                if (fqName !in existingClasses) {
-                    removedClasses.add(fqName)
-                }
-            }
-        }
-
-        val changesCollector = ChangesCollector()
-        removedClasses.forEach { changesCollector.collectSignature(FqName(it), areSubclassesAffected = true) }
-        val affectedByRemovedClasses = changesCollector.getDirtyFiles(incrementalCaches.values, kotlinContext.lookupStorageManager)
-
-        fsOperations.markFilesForCurrentRound(affectedByRemovedClasses.dirtyFiles + affectedByRemovedClasses.forceRecompileTogether)
-    }
-
-    override fun chunkBuildFinished(context: CompileContext, chunk: ModuleChunk) {
-        super.chunkBuildFinished(context, chunk)
-
-        if (chunk.isDummy(context)) return
-
-        // Temporary workaround for KT-33808
-        val kotlinContext = ensureKotlinContextInitialized(context)
-        for (target in chunk.targets) {
-            if (kotlinContext.hasKotlinMarker[target] != true) continue
-
-            val outputRoots = target.getOutputRoots(context)
-            if (outputRoots.size > 1) {
-                outputRoots.forEach { it.mkdirs() }
-            }
-        }
-
-        LOG.debug("------------------------------------------")
-    }
-
-    override fun build(
-        context: CompileContext,
-        chunk: ModuleChunk,
-        dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>,
-        outputConsumer: OutputConsumer
-    ): ExitCode {
-        if (chunk.isDummy(context))
-            return NOTHING_DONE
-
-        val kotlinTarget = context.kotlin.targetsBinding[chunk.representativeTarget()] ?: return OK
-        val messageCollector = MessageCollectorAdapter(context, kotlinTarget)
-
-        // New mpp project model: modules which is imported from sources sets of the compilations shouldn't be compiled for now.
-        // It should be compiled only as one of source root of target compilation, which is added in [KotlinSourceRootProvider].
-        if (chunk.modules.any { it.kotlinKind == KotlinModuleKind.SOURCE_SET_HOLDER }) {
-            if (chunk.modules.size > 1) {
-                messageCollector.report(
-                    ERROR,
-                    KotlinJpsBundle.message("error.text.cyclically.dependent.modules.are.not.supported.in.multiplatform.projects")
-                )
-                return ABORT
-            }
-
-            return NOTHING_DONE
-        }
-
-        val kotlinDirtyFilesHolder = KotlinDirtySourceFilesHolder(chunk, context, dirtyFilesHolder)
-        val fsOperations = FSOperationsHelper(context, chunk, kotlinDirtyFilesHolder, LOG)
-
-        try {
-            val proposedExitCode =
-                doBuild(chunk, kotlinTarget, context, kotlinDirtyFilesHolder, messageCollector, outputConsumer, fsOperations)
-
-            val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty) ADDITIONAL_PASS_REQUIRED else proposedExitCode
-
-            LOG.debug("Build result: $actualExitCode")
-
-            context.testingContext?.buildLogger?.buildFinished(actualExitCode)
-
-            return actualExitCode
-        } catch (e: StopBuildException) {
-            LOG.info("Caught exception: $e")
-            throw e
-        } catch (e: BuildDataCorruptedException) {
-            LOG.info("Caught exception: $e")
-            throw e
-        } catch (e: Throwable) {
-            LOG.info("Caught exception: $e")
-            MessageCollectorUtil.reportException(messageCollector, e)
-            return ABORT
-        }
-    }
-
-    private fun doBuild(
-        chunk: ModuleChunk,
-        representativeTarget: KotlinModuleBuildTarget<*>,
-        context: CompileContext,
-        kotlinDirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        messageCollector: MessageCollectorAdapter,
-        outputConsumer: OutputConsumer,
-        fsOperations: FSOperationsHelper
-    ): ExitCode {
-        // Workaround for Android Studio
-        if (representativeTarget is KotlinJvmModuleBuildTarget && !JavaBuilder.IS_ENABLED[context, true]) {
-            messageCollector.report(INFO, KotlinJpsBundle.message("info.text.kotlin.jps.plugin.is.disabled"))
-            return NOTHING_DONE
-        }
-
-        val kotlinContext = context.kotlin
-        val kotlinChunk = chunk.toKotlinChunk(context)!!
-
-        if (!kotlinChunk.haveSameCompiler) {
-            messageCollector.report(
-                ERROR,
-                KotlinJpsBundle.message("error.text.cyclically.dependent.modules.0.should.have.same.compiler", kotlinChunk.presentableModulesToCompilersList)
-            )
-            return ABORT
-        }
-
-        if (!kotlinChunk.isEnabled) {
-            return NOTHING_DONE
-        }
-
-        val projectDescriptor = context.projectDescriptor
-        val targets = chunk.targets
-
-        val isChunkRebuilding = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)
-                || targets.any { kotlinContext.rebuildAfterCacheVersionChanged[it] == true }
-
-        if (!kotlinDirtyFilesHolder.hasDirtyOrRemovedFiles) {
-            if (isChunkRebuilding) {
-                targets.forEach {
-                    kotlinContext.hasKotlinMarker[it] = false
-                }
-            }
-
-            targets.forEach { kotlinContext.rebuildAfterCacheVersionChanged.clean(it) }
-            return NOTHING_DONE
-        }
-
-        // Request CHUNK_REBUILD when IC is off and there are dirty Kotlin files
-        // Otherwise unexpected compile error might happen, when there are Groovy files,
-        // but they are not dirty, so Groovy builder does not generate source stubs,
-        // and Kotlin builder is filtering out output directory from classpath
-        // (because it may contain outdated Java classes).
-        if (!isChunkRebuilding && !representativeTarget.isIncrementalCompilationEnabled) {
-            targets.forEach { kotlinContext.rebuildAfterCacheVersionChanged[it] = true }
-            return CHUNK_REBUILD_REQUIRED
-        }
-
-        val targetsWithoutOutputDir = targets.filter { it.outputDir == null }
-        if (targetsWithoutOutputDir.isNotEmpty()) {
-            messageCollector.report(ERROR,
-                                    KotlinJpsBundle.message("error.text.output.directory.not.specified.for.0", targetsWithoutOutputDir.joinToString())
-            )
-            return ABORT
-        }
-
-        val project = projectDescriptor.project
-        val lookupTracker = getLookupTracker(project, representativeTarget)
-        val exceptActualTracer = ExpectActualTrackerImpl()
-        val incrementalCaches = kotlinChunk.loadCaches()
-        val inlineConstTracker = InlineConstTrackerImpl()
-        val environment = createCompileEnvironment(
-            context,
-            representativeTarget,
-            incrementalCaches,
-            lookupTracker,
-            exceptActualTracer,
-            inlineConstTracker,
-            chunk,
-            messageCollector
-        )
-
-        context.testingContext?.buildLogger?.compilingFiles(
-            kotlinDirtyFilesHolder.allDirtyFiles,
-            kotlinDirtyFilesHolder.allRemovedFilesFiles
-        )
-
-        cleanJsOutputs(context, kotlinChunk, incrementalCaches, kotlinDirtyFilesHolder)
-
-        if (LOG.isDebugEnabled) {
-            LOG.debug("Compiling files: ${kotlinDirtyFilesHolder.allDirtyFiles}")
-        }
-
-        val start = System.nanoTime()
-        val outputItemCollector = doCompileModuleChunk(
-            kotlinChunk,
-            representativeTarget,
-            kotlinChunk.compilerArguments,
-            context,
-            kotlinDirtyFilesHolder,
-            fsOperations,
-            environment,
-            incrementalCaches
-        )
-
-        statisticsLogger.registerStatistic(chunk, System.nanoTime() - start)
-
-        if (outputItemCollector == null) {
-            return NOTHING_DONE
-        }
-
-        val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false]
-        if (compilationErrors) {
-            LOG.info("Compiled with errors")
-            return ABORT
-        } else {
-            LOG.info("Compiled successfully")
-        }
-
-        val generatedFiles = getGeneratedFiles(context, chunk, environment.outputItemsCollector)
-
-        markDirtyComplementaryMultifileClasses(generatedFiles, kotlinContext, incrementalCaches, fsOperations)
-
-        val kotlinTargets = kotlinContext.targetsBinding
-        for ((target, outputItems) in generatedFiles) {
-            val kotlinTarget = kotlinTargets[target] ?: error("Could not find Kotlin target for JPS target $target")
-            kotlinTarget.registerOutputItems(outputConsumer, outputItems)
-        }
-        kotlinChunk.saveVersions()
-
-        if (targets.any { kotlinContext.hasKotlinMarker[it] == null }) {
-            fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = kotlinDirtyFilesHolder.allDirtyFiles)
-        }
-
-        for (target in targets) {
-            kotlinContext.hasKotlinMarker[target] = true
-            kotlinContext.rebuildAfterCacheVersionChanged.clean(target)
-        }
-
-        kotlinChunk.targets.forEach {
-            it.doAfterBuild()
-        }
-
-        representativeTarget.updateChunkMappings(
-            context,
-            chunk,
-            kotlinDirtyFilesHolder,
-            generatedFiles,
-            incrementalCaches,
-            environment
-        )
-
-        if (!representativeTarget.isIncrementalCompilationEnabled) {
-            return OK
-        }
-
-        context.checkCanceled()
-
-        environment.withProgressReporter { progress ->
-            progress.progress("performing incremental compilation analysis")
-
-            val changesCollector = ChangesCollector()
-
-            for ((target, files) in generatedFiles) {
-                val kotlinModuleBuilderTarget = kotlinContext.targetsBinding[target]!!
-                kotlinModuleBuilderTarget.updateCaches(
-                    kotlinDirtyFilesHolder,
-                    incrementalCaches[kotlinModuleBuilderTarget]!!,
-                    files,
-                    changesCollector,
-                    environment
-                )
-            }
-
-            updateLookupStorage(lookupTracker, kotlinContext.lookupStorageManager, kotlinDirtyFilesHolder)
-
-            if (!isChunkRebuilding) {
-                changesCollector.processChangesUsingLookups(
-                    kotlinDirtyFilesHolder.allDirtyFiles,
-                    kotlinContext.lookupStorageManager,
-                    fsOperations,
-                    incrementalCaches.values
-                )
-            }
-        }
-
-        return OK
-    }
-
-    private fun cleanJsOutputs(
-        context: CompileContext,
-        kotlinChunk: KotlinChunk,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        kotlinDirtyFilesHolder: KotlinDirtySourceFilesHolder
-    ) {
-        for (target in kotlinChunk.targets) {
-            val cache = incrementalCaches[target] ?: continue
-
-            if (cache is IncrementalJsCache) {
-                val filesToDelete = mutableListOf<File>()
-                val dirtyFiles = kotlinDirtyFilesHolder.getDirtyFiles(target.jpsModuleBuildTarget).keys
-                val removedFiles = kotlinDirtyFilesHolder.getRemovedFiles(target.jpsModuleBuildTarget)
-
-                for (file: File in dirtyFiles + removedFiles) {
-                    filesToDelete.addAll(cache.getOutputsBySource(file).filter { it !in filesToDelete })
-                }
-
-                if (filesToDelete.isNotEmpty()) {
-                    val deletedForThisSource = mutableSetOf<String>()
-                    val parentDirs = mutableSetOf<File>()
-
-                    for (kjsmFile in filesToDelete) {
-                        deleteRecursively(kjsmFile.path, deletedForThisSource, parentDirs)
-                    }
-
-                    FSOperations.pruneEmptyDirs(context, parentDirs)
-
-                    val logger = context.loggingManager.projectBuilderLogger
-                    if (logger.isEnabled && deletedForThisSource.isNotEmpty()) {
-                        logger.logDeletedFiles(deletedForThisSource)
-                    }
-                }
-            }
-        }
-    }
-
-    // todo(1.2.80): got rid of ModuleChunk (replace with KotlinChunk)
-    // todo(1.2.80): introduce KotlinRoundCompileContext, move dirtyFilesHolder, fsOperations, environment to it
-    private fun doCompileModuleChunk(
-        kotlinChunk: KotlinChunk,
-        representativeTarget: KotlinModuleBuildTarget<*>,
-        commonArguments: CommonCompilerArguments,
-        context: CompileContext,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        fsOperations: FSOperationsHelper,
-        environment: JpsCompilerEnvironment,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>
-    ): OutputItemsCollector? {
-        loadPlugins(representativeTarget, commonArguments, context)
-
-        kotlinChunk.targets.forEach {
-            it.nextRound(context)
-        }
-
-        if (representativeTarget.isIncrementalCompilationEnabled) {
-            for (target in kotlinChunk.targets) {
-                val cache = incrementalCaches[target]
-                val jpsTarget = target.jpsModuleBuildTarget
-
-                val targetDirtyFiles = dirtyFilesHolder.byTarget[jpsTarget]
-                if (cache != null && targetDirtyFiles != null) {
-                    val complementaryFiles = cache.getComplementaryFilesRecursive(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed)
-
-                    fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles)
-
-                    cache.markDirty(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed)
-                }
-            }
-        }
-
-        val isDoneSomething = representativeTarget.compileModuleChunk(commonArguments, dirtyFilesHolder, environment)
-
-        return if (isDoneSomething) environment.outputItemsCollector else null
-    }
-
-    private fun loadPlugins(
-        representativeTarget: KotlinModuleBuildTarget<*>,
-        commonArguments: CommonCompilerArguments,
-        context: CompileContext
-    ) {
-        fun concatenate(strings: Array<String>?, cp: List<String>) = arrayOf(*strings.orEmpty(), *cp.toTypedArray())
-
-        for (argumentProvider in ServiceLoader.load(KotlinJpsCompilerArgumentsProvider::class.java)) {
-            val jpsModuleBuildTarget = representativeTarget.jpsModuleBuildTarget
-            // appending to pluginOptions
-            commonArguments.pluginOptions = concatenate(
-                commonArguments.pluginOptions,
-                argumentProvider.getExtraArguments(jpsModuleBuildTarget, context)
-            )
-            // appending to classpath
-            commonArguments.pluginClasspaths = concatenate(
-                commonArguments.pluginClasspaths,
-                argumentProvider.getClasspath(jpsModuleBuildTarget, context)
-            )
-
-            LOG.debug("Plugin loaded: ${argumentProvider::class.java.simpleName}")
-        }
-    }
-
-    private fun createCompileEnvironment(
-        context: CompileContext,
-        kotlinModuleBuilderTarget: KotlinModuleBuildTarget<*>,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        lookupTracker: LookupTracker,
-        exceptActualTracer: ExpectActualTracker,
-        inlineConstTracker: InlineConstTracker,
-        chunk: ModuleChunk,
-        messageCollector: MessageCollectorAdapter
-    ): JpsCompilerEnvironment {
-        val compilerServices = with(Services.Builder()) {
-            kotlinModuleBuilderTarget.makeServices(this, incrementalCaches, lookupTracker, exceptActualTracer, inlineConstTracker)
-            build()
-        }
-
-        return JpsCompilerEnvironment(
-            compilerServices,
-            classesToLoadByParent,
-            messageCollector,
-            OutputItemsCollectorImpl(),
-            ProgressReporterImpl(context, chunk)
-        )
-    }
-
-    private fun getGeneratedFiles(
-        context: CompileContext,
-        chunk: ModuleChunk,
-        outputItemCollector: OutputItemsCollectorImpl
-    ): Map<ModuleBuildTarget, List<GeneratedFile>> {
-        // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below
-        val sourceToTarget = HashMap<File, ModuleBuildTarget>()
-        if (chunk.targets.size > 1) {
-            for (target in chunk.targets) {
-                context.kotlin.targetsBinding[target]?.sourceFiles?.forEach {
-                    sourceToTarget[it] = target
-                }
-            }
-        }
-
-        val representativeTarget = chunk.representativeTarget()
-        fun SimpleOutputItem.target() =
-            sourceFiles.firstOrNull()?.let { sourceToTarget[it] }
-                ?: chunk.targets.singleOrNull { target ->
-                    target.outputDir?.let { outputDir ->
-                        outputFile.startsWith(outputDir)
-                    } ?: false
-                }
-                ?: representativeTarget
-
-        return outputItemCollector.outputs
-            .sortedBy { it.outputFile }
-            .groupBy(SimpleOutputItem::target, SimpleOutputItem::toGeneratedFile)
-    }
-
-    private fun updateLookupStorage(
-        lookupTracker: LookupTracker,
-        lookupStorageManager: JpsLookupStorageManager,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder
-    ) {
-        if (lookupTracker !is LookupTrackerImpl)
-            throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker::class.java}")
-
-        lookupStorageManager.withLookupStorage { lookupStorage ->
-            lookupStorage.removeLookupsFrom(dirtyFilesHolder.allDirtyFiles.asSequence() + dirtyFilesHolder.allRemovedFilesFiles.asSequence())
-            lookupStorage.addAll(lookupTracker.lookups, lookupTracker.pathInterner.values)
-        }
-    }
-
-    private fun markDirtyComplementaryMultifileClasses(
-        generatedFiles: Map<ModuleBuildTarget, List<GeneratedFile>>,
-        kotlinContext: KotlinCompileContext,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        fsOperations: FSOperationsHelper
-    ) {
-        for ((target, files) in generatedFiles) {
-            val kotlinModuleBuilderTarget = kotlinContext.targetsBinding[target] ?: continue
-            val cache = incrementalCaches[kotlinModuleBuilderTarget] as? IncrementalJvmCache ?: continue
-            val generated = files.filterIsInstance<GeneratedJvmClass>()
-            val multifileClasses = generated.filter { it.outputClass.classHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS }
-            val expectedAllParts = multifileClasses.flatMap { cache.getAllPartsOfMultifileFacade(it.outputClass.className).orEmpty() }
-            if (multifileClasses.isEmpty()) continue
-            val actualParts = generated.filter { it.outputClass.classHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART }
-                .map { it.outputClass.className.toString() }
-            if (!actualParts.containsAll(expectedAllParts)) {
-                fsOperations.markFiles(expectedAllParts.flatMap { cache.sourcesByInternalName(it) }
-                                               + multifileClasses.flatMap { it.sourceFiles })
-            }
-        }
-    }
-}
-
-private class JpsICReporter : ICReporterBase() {
-    override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
-    }
-
-    override fun report(message: () -> String) {
-        if (KotlinBuilder.LOG.isDebugEnabled) {
-            KotlinBuilder.LOG.debug(message())
-        }
-    }
-
-    override fun reportVerbose(message: () -> String) {
-        report(message)
-    }
-}
-
-private fun ChangesCollector.processChangesUsingLookups(
-    compiledFiles: Set<File>,
-    lookupStorageManager: JpsLookupStorageManager,
-    fsOperations: FSOperationsHelper,
-    caches: Iterable<JpsIncrementalCache>
-) {
-    val allCaches = caches.flatMap { it.thisWithDependentCaches }
-    val reporter = JpsICReporter()
-
-    reporter.reportVerbose { "Start processing changes" }
-
-    val dirtyFiles = getDirtyFiles(allCaches, lookupStorageManager)
-    // if list of inheritors of sealed class has changed it should be recompiled with all the inheritors
-    // Here we have a small optimization. Do not recompile the bunch if ALL these files were recompiled during the previous round.
-    val excludeFiles = if (compiledFiles.containsAll(dirtyFiles.forceRecompileTogether))
-        compiledFiles
-    else
-        compiledFiles.minus(dirtyFiles.forceRecompileTogether)
-    fsOperations.markInChunkOrDependents(
-        (dirtyFiles.dirtyFiles + dirtyFiles.forceRecompileTogether).asIterable(),
-        excludeFiles = excludeFiles
-    )
-
-    reporter.reportVerbose { "End of processing changes" }
-}
-
-data class FilesToRecompile(val dirtyFiles: Set<File>, val forceRecompileTogether: Set<File>)
-
-private fun ChangesCollector.getDirtyFiles(
-    caches: Iterable<IncrementalCacheCommon>,
-    lookupStorageManager: JpsLookupStorageManager
-): FilesToRecompile {
-    val reporter = JpsICReporter()
-    val (dirtyLookupSymbols, dirtyClassFqNames, forceRecompile) = getDirtyData(caches, reporter)
-    val dirtyFilesFromLookups = lookupStorageManager.withLookupStorage {
-        mapLookupSymbolsToFiles(it, dirtyLookupSymbols, reporter)
-    }
-    return FilesToRecompile(
-        dirtyFilesFromLookups + mapClassesFqNamesToFiles(caches, dirtyClassFqNames, reporter),
-        mapClassesFqNamesToFiles(caches, forceRecompile, reporter)
-    )
-
-}
-
-private fun getLookupTracker(project: JpsProject, representativeTarget: KotlinModuleBuildTarget<*>): LookupTracker {
-    val testLookupTracker = project.testingContext?.lookupTracker ?: LookupTracker.DO_NOTHING
-
-    if (representativeTarget.isIncrementalCompilationEnabled) return LookupTrackerImpl(testLookupTracker)
-
-    return testLookupTracker
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.kt
deleted file mode 100644
index e4fc611981e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.incremental.BuilderService
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.kotlin.jps.incremental.KotlinCompilerReferenceIndexBuilder
-
-class KotlinBuilderService : BuilderService() {
-    override fun createModuleLevelBuilders(): List<ModuleLevelBuilder> = listOf(KotlinBuilder(), KotlinCompilerReferenceIndexBuilder())
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
deleted file mode 100644
index 8db5ea8de4ad..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.kotlin.config.ApiVersion
-import org.jetbrains.kotlin.config.LanguageVersion
-import org.jetbrains.kotlin.config.VersionView
-import org.jetbrains.kotlin.jps.incremental.CacheStatus
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.incremental.getKotlinCache
-import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.utils.keysToMapExceptNulls
-import java.nio.file.Path
-import kotlin.io.path.writeText
-
-/**
- * Chunk of cyclically dependent [KotlinModuleBuildTarget]s
- */
-class KotlinChunk internal constructor(val context: KotlinCompileContext, val targets: List<KotlinModuleBuildTarget<*>>) {
-    val containsTests = targets.any { it.isTests }
-
-    lateinit var dependencies: List<KotlinModuleBuildTarget.Dependency>
-        // Should be initialized only in KotlinChunk.calculateChunkDependencies
-        internal set
-
-    lateinit var dependent: List<KotlinModuleBuildTarget.Dependency>
-        // Should be initialized only in KotlinChunk.calculateChunkDependencies
-        internal set
-
-    // used only during dependency calculation
-    internal var _dependent: MutableSet<KotlinModuleBuildTarget.Dependency>? = mutableSetOf()
-
-    val representativeTarget
-        get() = targets.first()
-
-    val presentableModulesToCompilersList: String
-        get() = targets.joinToString { "${it.module.name} (${it.globalLookupCacheId})" }
-
-    val haveSameCompiler = targets.all { it.javaClass == representativeTarget.javaClass }
-
-    private val defaultLanguageVersion = VersionView.RELEASED_VERSION
-
-    val compilerArguments by lazy {
-        representativeTarget.jpsModuleBuildTarget.module.kotlinCompilerArguments.also {
-            it.reportOutputFiles = true
-
-            // Always report the version to help diagnosing user issues if they submit the compiler output
-            it.version = true
-
-            if (it.languageVersion == null) it.languageVersion = defaultLanguageVersion.versionString
-        }
-    }
-
-    val langVersion by lazy {
-        compilerArguments.languageVersion?.let { LanguageVersion.fromVersionString(it) }
-            ?: defaultLanguageVersion // use default language version when version string is invalid (todo: report warning?)
-    }
-
-    val apiVersion by lazy {
-        compilerArguments.apiVersion?.let { ApiVersion.parse(it) }
-            ?: ApiVersion.createByLanguageVersion(langVersion) // todo: report version parse error?
-    }
-
-    val isEnabled: Boolean by lazy {
-        representativeTarget.isEnabled(compilerArguments)
-    }
-
-    fun shouldRebuild(): Boolean {
-        val buildMetaInfo = representativeTarget.buildMetaInfoFactory.create(compilerArguments)
-
-        targets.forEach { target ->
-            if (target.isVersionChanged(this, buildMetaInfo)) {
-                KotlinBuilder.LOG.info("$target version changed, rebuilding $this")
-                return true
-            }
-
-            if (target.initialLocalCacheAttributesDiff.status == CacheStatus.INVALID) {
-                context.testingLogger?.invalidOrUnusedCache(this, null, target.initialLocalCacheAttributesDiff)
-                KotlinBuilder.LOG.info("$target cache is invalid ${target.initialLocalCacheAttributesDiff}, rebuilding $this")
-                return true
-            }
-        }
-
-        return false
-    }
-
-    fun buildMetaInfoFile(target: ModuleBuildTarget): Path = context.dataPaths
-        .getTargetDataRoot(target)
-        .toPath()
-        .resolve(representativeTarget.buildMetaInfoFileName)
-
-    fun saveVersions() {
-        context.ensureLookupsCacheAttributesSaved()
-
-        targets.forEach {
-            it.initialLocalCacheAttributesDiff.manager.writeVersion()
-        }
-
-        val serializedMetaInfo = representativeTarget.buildMetaInfoFactory.serializeToString(compilerArguments)
-
-        targets.forEach {
-            buildMetaInfoFile(it.jpsModuleBuildTarget).writeText(serializedMetaInfo)
-        }
-    }
-
-    fun collectDependentChunksRecursivelyExportedOnly(result: MutableSet<KotlinChunk> = mutableSetOf()) {
-        dependent.forEach {
-            if (result.add(it.src.chunk)) {
-                if (it.exported) {
-                    it.src.chunk.collectDependentChunksRecursivelyExportedOnly(result)
-                }
-            }
-        }
-    }
-
-    fun loadCaches(loadDependent: Boolean = true): Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache> {
-        val dataManager = context.dataManager
-
-        val cacheByChunkTarget = targets.keysToMapExceptNulls {
-            dataManager.getKotlinCache(it)
-        }
-
-        if (loadDependent) {
-            addDependentCaches(cacheByChunkTarget.values)
-        }
-
-        return cacheByChunkTarget
-    }
-
-    private fun addDependentCaches(targetsCaches: Collection<JpsIncrementalCache>) {
-        val dependentChunks = mutableSetOf<KotlinChunk>()
-
-        collectDependentChunksRecursivelyExportedOnly(dependentChunks)
-
-        val dataManager = context.dataManager
-        dependentChunks.forEach { decedentChunk ->
-            decedentChunk.targets.forEach {
-                val dependentCache = dataManager.getKotlinCache(it)
-                if (dependentCache != null) {
-
-                    for (chunkCache in targetsCaches) {
-                        chunkCache.addJpsDependentCache(dependentCache)
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * The same as [org.jetbrains.jps.ModuleChunk.getPresentableShortName]
-     */
-    val presentableShortName: String
-        get() = buildString {
-            if (containsTests) append("tests of ")
-            append(targets.first().module.name)
-            if (targets.size > 1) {
-                val andXMore = " and ${targets.size - 1} more"
-                val other = ", " + targets.asSequence().drop(1).joinToString()
-                append(if (other.length < andXMore.length) other else andXMore)
-            }
-        }
-
-    override fun toString(): String {
-        return "KotlinChunk<${representativeTarget.javaClass.simpleName}>" +
-                "(${targets.joinToString { it.jpsModuleBuildTarget.presentableName }})"
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
deleted file mode 100644
index 6d8687aabcb3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinCompileContext.kt
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.FSOperations
-import org.jetbrains.jps.incremental.GlobalContextKey
-import org.jetbrains.jps.incremental.fs.CompilationRound
-import org.jetbrains.jps.incremental.messages.BuildMessage
-import org.jetbrains.jps.incremental.messages.CompilerMessage
-import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
-import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
-import org.jetbrains.kotlin.jps.KotlinJpsBundle
-import org.jetbrains.kotlin.jps.incremental.*
-import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
-import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndexBuilder
-import org.jetbrains.kotlin.jps.targets.KotlinUnsupportedModuleBuildTarget
-import java.io.File
-import java.util.concurrent.atomic.AtomicBoolean
-
-/**
- *  KotlinCompileContext is shared between all threads (i.e. it is [GlobalContextKey]).
- *
- *  It is initialized lazily, and only before building of first chunk with kotlin code,
- *  and will be disposed on build finish.
- */
-/*internal */val CompileContext.kotlin: KotlinCompileContext
-    get() {
-        val userData = getUserData(kotlinCompileContextKey)
-        if (userData != null) return userData
-
-        // here is error (KotlinCompilation available only at build phase)
-        // let's also check for concurrent initialization
-        val errorMessage = "KotlinCompileContext available only at build phase " +
-                "(between first KotlinBuilder.chunkBuildStarted and KotlinBuilder.buildFinished)"
-
-        synchronized(kotlinCompileContextKey) {
-            val newUsedData = getUserData(kotlinCompileContextKey)
-            if (newUsedData != null) {
-                error("Concurrent CompileContext.kotlin getter call and KotlinCompileContext initialization detected: $errorMessage")
-            }
-        }
-
-        error(errorMessage)
-    }
-
-internal val kotlinCompileContextKey = GlobalContextKey<KotlinCompileContext>("kotlin")
-
-class KotlinCompileContext(val jpsContext: CompileContext) {
-    val dataManager = jpsContext.projectDescriptor.dataManager
-    val dataPaths = dataManager.dataPaths
-    val testingLogger: TestingBuildLogger?
-        get() = jpsContext.testingContext?.buildLogger
-
-    val targetsIndex: KotlinTargetsIndex = KotlinTargetsIndexBuilder(this).build()
-
-    val targetsBinding
-        get() = targetsIndex.byJpsTarget
-
-    val lookupsCacheAttributesManager: CompositeLookupsCacheAttributesManager = makeLookupsCacheAttributesManager()
-
-    val shouldCheckCacheVersions = System.getProperty(KotlinBuilder.SKIP_CACHE_VERSION_CHECK_PROPERTY) == null
-
-    val hasKotlinMarker = HasKotlinMarker(dataManager)
-
-    val isInstrumentationEnabled: Boolean by lazy {
-        val value = System.getProperty("kotlin.jps.instrument.bytecode")?.toBoolean() ?: false
-        if (value) {
-            val message = KotlinJpsBundle.message("compiler.text.experimental.bytecode.instrumentation.for.kotlin.classes.is.enabled")
-            jpsContext.processMessage(CompilerMessage(KOTLIN_COMPILER_NAME, BuildMessage.Kind.INFO, message))
-        }
-        value
-    }
-
-    val fileToPathConverter: FileToPathConverter =
-        JpsFileToPathConverter(jpsContext.projectDescriptor.project)
-
-    val lookupStorageManager = JpsLookupStorageManager(dataManager, fileToPathConverter)
-
-    /**
-     * Flag to prevent rebuilding twice.
-     *
-     * TODO: looks like it is not required since cache version checking are refactored
-     */
-    val rebuildAfterCacheVersionChanged = RebuildAfterCacheVersionChangeMarker(dataManager)
-
-    var rebuildingAllKotlin = false
-
-    /**
-     * Note, [loadLookupsCacheStateDiff] should be initialized last as it requires initialized
-     * [targetsIndex], [hasKotlinMarker] and [rebuildAfterCacheVersionChanged] (see [markChunkForRebuildBeforeBuild])
-     */
-    private val initialLookupsCacheStateDiff: CacheAttributesDiff<*> = loadLookupsCacheStateDiff()
-
-    private fun makeLookupsCacheAttributesManager(): CompositeLookupsCacheAttributesManager {
-        val expectedLookupsCacheComponents = mutableSetOf<String>()
-
-        targetsIndex.chunks.forEach { chunk ->
-            chunk.targets.forEach { target ->
-                if (target.isIncrementalCompilationEnabled) {
-                    expectedLookupsCacheComponents.add(target.globalLookupCacheId)
-                }
-            }
-        }
-
-        val lookupsCacheRootPath = dataPaths.getTargetDataRoot(KotlinDataContainerTarget)
-        return CompositeLookupsCacheAttributesManager(lookupsCacheRootPath.toPath(), expectedLookupsCacheComponents)
-    }
-
-    private fun loadLookupsCacheStateDiff(): CacheAttributesDiff<CompositeLookupsCacheAttributes> {
-        val diff = lookupsCacheAttributesManager.loadDiff()
-
-        if (diff.status == CacheStatus.VALID) {
-            // try to perform a lookup
-            // request rebuild if storage is corrupted
-            try {
-                lookupStorageManager.withLookupStorage {
-                    it.get(LookupSymbol("<#NAME#>", "<#SCOPE#>"))
-                }
-            } catch (e: Exception) {
-                // replace to jpsReportInternalBuilderError when IDEA-201297 will be implemented
-                jpsContext.processMessage(
-                    CompilerMessage(
-                        "Kotlin", BuildMessage.Kind.WARNING,
-                        KotlinJpsBundle.message("compiler.text.incremental.caches.are.corrupted.all.kotlin.code.will.be.rebuilt")
-                    )
-                )
-                KotlinBuilder.LOG.info(Error("Lookup storage is corrupted, probe failed: ${e.message}", e))
-
-                markAllKotlinForRebuild("Lookup storage is corrupted")
-                return diff.copy(actual = null)
-            }
-        }
-
-        return diff
-    }
-
-    fun hasKotlin() = targetsIndex.chunks.any { chunk ->
-        chunk.targets.any { target ->
-            hasKotlinMarker[target] == true
-        }
-    }
-
-    fun checkCacheVersions() {
-        when (initialLookupsCacheStateDiff.status) {
-            CacheStatus.INVALID -> {
-                // global cache needs to be rebuilt
-
-                testingLogger?.invalidOrUnusedCache(null, null, initialLookupsCacheStateDiff)
-
-                if (initialLookupsCacheStateDiff.actual != null) {
-                    markAllKotlinForRebuild("Kotlin incremental cache settings or format was changed")
-                    clearLookupCache()
-                } else {
-                    markAllKotlinForRebuild("Kotlin incremental cache is missed or corrupted")
-                }
-            }
-            CacheStatus.VALID -> Unit
-            CacheStatus.SHOULD_BE_CLEARED -> {
-                jpsContext.testingContext?.buildLogger?.invalidOrUnusedCache(null, null, initialLookupsCacheStateDiff)
-                KotlinBuilder.LOG.info("Removing global cache as it is not required anymore: $initialLookupsCacheStateDiff")
-
-                clearAllCaches()
-            }
-            CacheStatus.CLEARED -> Unit
-        }
-    }
-
-    private val lookupAttributesSaved = AtomicBoolean(false)
-
-    /**
-     * Called on every successful compilation
-     */
-    fun ensureLookupsCacheAttributesSaved() {
-        if (lookupAttributesSaved.compareAndSet(false, true)) {
-            initialLookupsCacheStateDiff.manager.writeVersion()
-        }
-    }
-
-    fun checkChunkCacheVersion(chunk: KotlinChunk) {
-        if (shouldCheckCacheVersions && !rebuildingAllKotlin) {
-            if (chunk.shouldRebuild()) markChunkForRebuildBeforeBuild(chunk)
-        }
-    }
-
-    private fun logMarkDirtyForTestingBeforeRound(file: File, shouldProcess: Boolean): Boolean {
-        if (shouldProcess) {
-            testingLogger?.markedAsDirtyBeforeRound(listOf(file))
-        }
-        return shouldProcess
-    }
-
-    private fun markAllKotlinForRebuild(reason: String) {
-        if (rebuildingAllKotlin) return
-        rebuildingAllKotlin = true
-
-        KotlinBuilder.LOG.info("Rebuilding all Kotlin: $reason")
-
-        targetsIndex.chunks.forEach {
-            markChunkForRebuildBeforeBuild(it)
-        }
-
-        lookupStorageManager.cleanLookupStorage(KotlinBuilder.LOG)
-    }
-
-    private fun markChunkForRebuildBeforeBuild(chunk: KotlinChunk) {
-        chunk.targets.forEach {
-            FSOperations.markDirty(jpsContext, CompilationRound.NEXT, it.jpsModuleBuildTarget) { file ->
-                logMarkDirtyForTestingBeforeRound(file, file.isKotlinSourceFile)
-            }
-
-            dataManager.getKotlinCache(it)?.clean()
-            hasKotlinMarker.clean(it)
-            rebuildAfterCacheVersionChanged[it] = true
-        }
-    }
-
-    private fun clearAllCaches() {
-        clearLookupCache()
-
-        KotlinBuilder.LOG.info("Clearing caches for all targets")
-        targetsIndex.chunks.forEach { chunk ->
-            chunk.targets.forEach {
-                dataManager.getKotlinCache(it)?.clean()
-            }
-        }
-    }
-
-    private fun clearLookupCache() {
-        KotlinBuilder.LOG.info("Clearing lookup cache")
-        lookupStorageManager.cleanLookupStorage(KotlinBuilder.LOG)
-        initialLookupsCacheStateDiff.manager.writeVersion()
-    }
-
-    fun cleanupCaches() {
-        // todo: remove lookups for targets with disabled IC (or split global lookups cache into several caches for each compiler)
-
-        targetsIndex.chunks.forEach { chunk ->
-            chunk.targets.forEach { target ->
-                if (target.initialLocalCacheAttributesDiff.status == CacheStatus.SHOULD_BE_CLEARED) {
-                    KotlinBuilder.LOG.info(
-                        "$target caches is cleared as not required anymore: ${target.initialLocalCacheAttributesDiff}"
-                    )
-                    testingLogger?.invalidOrUnusedCache(null, target, target.initialLocalCacheAttributesDiff)
-                    target.initialLocalCacheAttributesDiff.manager.writeVersion(null)
-                    dataManager.getKotlinCache(target)?.clean()
-                }
-            }
-        }
-    }
-
-    fun dispose() {
-
-    }
-
-    fun getChunk(rawChunk: ModuleChunk): KotlinChunk? {
-        val rawRepresentativeTarget = rawChunk.representativeTarget()
-        if (rawRepresentativeTarget !in targetsBinding) return null
-
-        return targetsIndex.chunksByJpsRepresentativeTarget[rawRepresentativeTarget]
-            ?: error("Kotlin binding for chunk $this is not loaded at build start")
-    }
-
-    fun reportUnsupportedTargets() {
-        // group all KotlinUnsupportedModuleBuildTarget by kind
-        // only representativeTarget will be added
-        val byKind = mutableMapOf<String?, MutableList<KotlinUnsupportedModuleBuildTarget>>()
-
-        targetsIndex.chunks.forEach {
-            val target = it.representativeTarget
-            if (target is KotlinUnsupportedModuleBuildTarget) {
-                if (target.sourceFiles.isNotEmpty()) {
-                    byKind.getOrPut(target.kind) { mutableListOf() }.add(target)
-                }
-            }
-        }
-
-        byKind.forEach { (kind, targets) ->
-            targets.sortBy { it.module.name }
-            val chunkNames = targets.map { it.chunk.presentableShortName }
-            val presentableChunksListString = chunkNames.joinToReadableString()
-
-            val msg =
-                if (kind == null) {
-                    KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.them.enable.delegate.ide.build.run.actions.to.gradle.in.settings", presentableChunksListString)
-                } else {
-                    KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.1.enable.delegate.ide.build.run.actions.to.gradle.in.settings", kind, presentableChunksListString)
-                }
-
-            testingLogger?.addCustomMessage(msg)
-            jpsContext.processMessage(
-                CompilerMessage(
-                    KOTLIN_COMPILER_NAME,
-                    BuildMessage.Kind.WARNING,
-                    msg
-                )
-            )
-        }
-    }
-}
-
-fun List<String>.joinToReadableString(): String = when {
-    size > 5 -> take(5).joinToString() + " and ${size - 5} more"
-    size > 1 -> dropLast(1).joinToString() + " and ${last()}"
-    size == 1 -> single()
-    else -> ""
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
deleted file mode 100644
index ecb2cf6056cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.io.FileUtilRt
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.DirtyFilesHolder
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import java.io.File
-
-/**
- * Holding kotlin dirty files list for particular build round.
- * Dirty and removed files set are initialized from [delegate].
- *
- * Additional dirty files should be added only through [FSOperationsHelper.markFilesForCurrentRound]
- */
-class KotlinDirtySourceFilesHolder(
-    val chunk: ModuleChunk,
-    val context: CompileContext,
-    delegate: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>
-) {
-    val byTarget: Map<ModuleBuildTarget, TargetFiles>
-
-    inner class TargetFiles(val target: ModuleBuildTarget, val removed: Collection<File>) {
-        private val _dirty: MutableMap<File, KotlinModuleBuildTarget.Source> = mutableMapOf()
-
-        val dirty: Map<File, KotlinModuleBuildTarget.Source>
-            get() = _dirty
-
-        /**
-         * Should be called only from [FSOperationsHelper.markFilesForCurrentRound]
-         * and during KotlinDirtySourceFilesHolder initialization.
-         */
-        internal fun _markDirty(file: File, root: JavaSourceRootDescriptor) {
-            val isCrossCompiled = root is KotlinIncludedModuleSourceRoot
-            val old = _dirty.put(file.canonicalFile, KotlinModuleBuildTarget.Source(file, isCrossCompiled))
-
-            check(old == null || old.isCrossCompiled == isCrossCompiled) {
-                "`${file.canonicalFile}` already marked as dirty: " +
-                        "old is cross compiled: ${old!!.isCrossCompiled}, " +
-                        "new is cross compiled: $isCrossCompiled"
-            }
-        }
-    }
-
-    val hasRemovedFiles: Boolean
-        get() = byTarget.any { it.value.removed.isNotEmpty() }
-
-    val hasDirtyFiles: Boolean
-        get() = byTarget.any { it.value.dirty.isNotEmpty() }
-
-    val hasDirtyOrRemovedFiles: Boolean
-        get() = hasRemovedFiles || hasDirtyFiles
-
-    init {
-        val byTarget = mutableMapOf<ModuleBuildTarget, TargetFiles>()
-
-        chunk.targets.forEach { target ->
-            val removedFiles = delegate.getRemovedFiles(target)
-                .map { File(it) }
-                .filter { it.isKotlinSourceFile }
-
-            byTarget[target] = TargetFiles(target, removedFiles)
-        }
-
-        delegate.processDirtyFiles { target, file, root ->
-            val targetInfo = byTarget[target]
-                ?: error("processDirtyFiles should callback only on chunk `$chunk` targets (`$target` is not)")
-
-            if (file.isKotlinSourceFile) {
-                targetInfo._markDirty(file, root)
-            }
-
-            true
-        }
-
-        this.byTarget = byTarget
-    }
-
-    fun getDirtyFiles(target: ModuleBuildTarget): Map<File, KotlinModuleBuildTarget.Source> =
-        byTarget[target]?.dirty ?: mapOf()
-
-    fun getRemovedFiles(target: ModuleBuildTarget): Collection<File> =
-        byTarget[target]?.removed ?: listOf()
-
-    val allDirtyFiles: Set<File>
-        get() = byTarget.flatMapTo(mutableSetOf()) { it.value.dirty.keys }
-
-    val allRemovedFilesFiles: Set<File>
-        get() = byTarget.flatMapTo(mutableSetOf()) { it.value.removed }
-}
-
-val File.isKotlinSourceFile: Boolean
-    get() = FileUtilRt.extensionEquals(name, "kt") || FileUtilRt.extensionEquals(name, "kts")
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJavaBuilderExtension.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJavaBuilderExtension.kt
deleted file mode 100644
index 314ab6e75515..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJavaBuilderExtension.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.api.BasicFuture
-import org.jetbrains.jps.builders.java.JavaBuilderExtension
-import org.jetbrains.jps.builders.java.dependencyView.Callbacks
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.kotlin.incremental.LookupSymbol
-import java.io.File
-import java.util.concurrent.Executors
-import java.util.concurrent.Future
-import java.util.concurrent.TimeUnit
-
-class KotlinJavaBuilderExtension : JavaBuilderExtension() {
-    override fun getConstantSearch(context: CompileContext): Callbacks.ConstantAffectionResolver {
-        return KotlinLookupConstantSearch(context)
-    }
-}
-
-private class KotlinLookupConstantSearch(context: CompileContext) : Callbacks.ConstantAffectionResolver {
-    private val pool = Executors.newSingleThreadExecutor()
-    private val kotlinContext by lazy { context.kotlin }
-
-    override fun request(
-        ownerClassName: String,
-        fieldName: String,
-        accessFlags: Int,
-        fieldRemoved: Boolean,
-        accessChanged: Boolean
-    ): Future<Callbacks.ConstantAffection> {
-        val future = object : BasicFuture<Callbacks.ConstantAffection>() {
-            @Volatile
-            private var result: Callbacks.ConstantAffection = Callbacks.ConstantAffection.EMPTY
-
-            fun result(files: Collection<File>) {
-                result = Callbacks.ConstantAffection(files)
-                setDone()
-            }
-
-            override fun get(): Callbacks.ConstantAffection {
-                super.get()
-                return result
-            }
-
-            override fun get(timeout: Long, unit: TimeUnit): Callbacks.ConstantAffection {
-                super.get(timeout, unit)
-                return result
-            }
-        }
-        pool.submit {
-            if (!future.isCancelled) {
-                kotlinContext.lookupStorageManager.withLookupStorage { storage ->
-                    val paths = storage.get(LookupSymbol(name = fieldName, scope = ownerClassName))
-                    future.result(paths.map { File(it) })
-                }
-            }
-        }
-        return future
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
deleted file mode 100644
index 2f5291debea8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-
-interface KotlinJpsCompilerArgumentsProvider {
-    fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
-    fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinResourcesRootProvider.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinResourcesRootProvider.kt
deleted file mode 100644
index aff24b468872..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinResourcesRootProvider.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.builders.AdditionalRootsProviderService
-import org.jetbrains.jps.builders.BuildTarget
-import org.jetbrains.jps.builders.java.ResourceRootDescriptor
-import org.jetbrains.jps.builders.java.ResourcesTargetType
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ResourcesTarget
-import org.jetbrains.jps.model.java.JavaResourceRootProperties
-import org.jetbrains.kotlin.config.ResourceKotlinRootType
-import org.jetbrains.kotlin.config.TestResourceKotlinRootType
-
-class KotlinResourcesRootProvider : AdditionalRootsProviderService<ResourceRootDescriptor>(ResourcesTargetType.ALL_TYPES) {
-    override fun getAdditionalRoots(
-        target: BuildTarget<ResourceRootDescriptor>,
-        dataPaths: BuildDataPaths?
-    ): List<ResourceRootDescriptor> {
-        val moduleBuildTarget = target as? ResourcesTarget ?: return listOf()
-        val module = moduleBuildTarget.module
-
-        val result = mutableListOf<ResourceRootDescriptor>()
-
-        // Add source roots with type KotlinResourceRootType.
-        // See the note in KotlinSourceRootProvider
-        val kotlinResourceRootType = if (target.isTests) TestResourceKotlinRootType else ResourceKotlinRootType
-        module.getSourceRoots(kotlinResourceRootType).forEach {
-            result.add(
-                ResourceRootDescriptor(
-                    it.file,
-                    target,
-                    it.properties.packagePrefix,
-                    setOf()
-                )
-            )
-        }
-
-        return result
-    }
-}
-
-/**
- * Copied from implementation of org.jetbrains.jps.incremental.ResourcesTarget.computeRootDescriptors
- */
-private val JavaResourceRootProperties.packagePrefix: String
-    get() = relativeOutputPath.replace('/', '.')
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt
deleted file mode 100644
index c7fc464ead60..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceRootProvider.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.builders.AdditionalRootsProviderService
-import org.jetbrains.jps.builders.BuildTarget
-import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.model.java.JavaResourceRootType
-import org.jetbrains.jps.model.java.JavaSourceRootProperties
-import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.model.module.JpsModuleSourceRootType
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.jps.model.expectedByModules
-import org.jetbrains.kotlin.jps.model.isTestModule
-import org.jetbrains.kotlin.jps.model.sourceSetModules
-import java.io.File
-
-class KotlinSourceRootProvider : AdditionalRootsProviderService<JavaSourceRootDescriptor>(JavaModuleBuildTargetType.ALL_TYPES) {
-    override fun getAdditionalRoots(
-        target: BuildTarget<JavaSourceRootDescriptor>,
-        dataPaths: BuildDataPaths?
-    ): List<JavaSourceRootDescriptor> {
-        val moduleBuildTarget = target as? ModuleBuildTarget ?: return listOf()
-        val module = moduleBuildTarget.module
-
-        val result = mutableListOf<JavaSourceRootDescriptor>()
-
-        // Add source roots with type KotlinSourceRootType.
-        //
-        // Note: `KotlinSourceRootType` cannot be supported directly, since `SourceRootDescriptors` are computed by
-        // `ModuleBuildTarget.computeAllTargets`. `ModuleBuildTarget` is required for incremental compilation.
-        // We cannot define our own `ModuleBuildTarget` since it is final and `ModuleBuildTarget` supports only `JavaSourceRootDescriptor`.
-        // So the only one way to support `KotlinSourceRootType` is to add a fake `JavaSourceRootDescriptor` for each source root with that type.
-        val kotlinSourceRootType = if (target.isTests) TestSourceKotlinRootType else SourceKotlinRootType
-        module.getSourceRoots(kotlinSourceRootType).forEach {
-            result.add(
-                JavaSourceRootDescriptor(
-                    it.file,
-                    target,
-                    false,
-                    false,
-                    it.properties.packagePrefix,
-                    setOf()
-                )
-            )
-        }
-
-        // new multiplatform model support:
-        if (target.isTests == module.isTestModule) {
-            module.sourceSetModules.forEach { sourceSetModule ->
-                addModuleSourceRoots(result, sourceSetModule, target)
-            }
-        }
-
-        // legacy multiplatform model support:
-        module.expectedByModules.forEach { commonModule ->
-            addModuleSourceRoots(result, commonModule, target)
-        }
-
-        return result
-    }
-
-    private fun addModuleSourceRoots(
-        result: MutableList<JavaSourceRootDescriptor>,
-        module: JpsModule,
-        target: ModuleBuildTarget
-    ) {
-        for (commonSourceRoot in module.sourceRoots) {
-            val isCommonTestsRootType = commonSourceRoot.rootType.isTestsRootType
-            if (isCommonTestsRootType != null && target.isTests == isCommonTestsRootType) {
-                val javaSourceRootProperties = commonSourceRoot.properties as? JavaSourceRootProperties
-
-                result.add(
-                    KotlinIncludedModuleSourceRoot(
-                        commonSourceRoot.file,
-                        target,
-                        javaSourceRootProperties?.isForGeneratedSources ?: false,
-                        false,
-                        javaSourceRootProperties?.packagePrefix ?: "",
-                        setOf()
-                    )
-                )
-            }
-        }
-    }
-}
-
-private val JpsModuleSourceRootType<*>.isTestsRootType
-    get() = when (this) {
-        is KotlinSourceRootType -> this == TestSourceKotlinRootType
-        is KotlinResourceRootType -> this == TestResourceKotlinRootType
-        // for compatibility:
-        is JavaSourceRootType -> this == JavaSourceRootType.TEST_SOURCE
-        is JavaResourceRootType -> this == JavaResourceRootType.TEST_RESOURCE
-        else -> null
-    }
-
-class KotlinIncludedModuleSourceRoot(
-    root: File,
-    target: ModuleBuildTarget,
-    isGenerated: Boolean,
-    isTemp: Boolean,
-    packagePrefix: String,
-    excludes: Set<File>
-) : JavaSourceRootDescriptor(root, target, isGenerated, isTemp, packagePrefix, excludes)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
deleted file mode 100644
index 8f6246cf9afd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.storage.BuildDataManager
-import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import java.io.File
-
-private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt"
-private val REBUILD_AFTER_CACHE_VERSION_CHANGE_MARKER = "rebuild-after-cache-version-change-marker.txt"
-
-abstract class MarkerFile(private val fileName: String, private val paths: BuildDataPaths) {
-    operator fun get(target: KotlinModuleBuildTarget<*>): Boolean? =
-        get(target.jpsModuleBuildTarget)
-
-    operator fun get(target: ModuleBuildTarget): Boolean? {
-        val file = target.markerFile
-
-        if (!file.exists()) return null
-
-        return file.readText().toBoolean()
-    }
-
-    operator fun set(target: KotlinModuleBuildTarget<*>, value: Boolean) =
-        set(target.jpsModuleBuildTarget, value)
-
-    operator fun set(target: ModuleBuildTarget, value: Boolean) {
-        val file = target.markerFile
-
-        if (!file.exists()) {
-            file.parentFile.mkdirs()
-            file.createNewFile()
-        }
-
-        file.writeText(value.toString())
-    }
-
-    fun clean(target: KotlinModuleBuildTarget<*>) =
-        clean(target.jpsModuleBuildTarget)
-
-    fun clean(target: ModuleBuildTarget) {
-        target.markerFile.delete()
-    }
-
-    private val ModuleBuildTarget.markerFile: File
-        get() {
-            val directory = File(paths.getTargetDataRoot(this), KOTLIN_CACHE_DIRECTORY_NAME)
-            return File(directory, fileName)
-        }
-}
-
-class HasKotlinMarker(dataManager: BuildDataManager) : MarkerFile(HAS_KOTLIN_MARKER_FILE_NAME, dataManager.dataPaths)
-class RebuildAfterCacheVersionChangeMarker(dataManager: BuildDataManager) :
-    MarkerFile(REBUILD_AFTER_CACHE_VERSION_CHANGE_MARKER, dataManager.dataPaths)
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt
deleted file mode 100644
index 45d1e0c57e6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.annotations.Nls
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.messages.BuildMessage
-import org.jetbrains.jps.incremental.messages.CompilerMessage
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.config.CompilerRunnerConstants
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import java.io.File
-
-class MessageCollectorAdapter(
-    private val context: CompileContext,
-    private val kotlinTarget: KotlinModuleBuildTarget<*>?
-) : MessageCollector {
-    private var hasErrors = false
-
-    override fun report(severity: CompilerMessageSeverity, @Nls message: String, location: CompilerMessageSourceLocation?) {
-        hasErrors = hasErrors || severity.isError
-
-        var prefix = ""
-        if (severity == CompilerMessageSeverity.EXCEPTION) {
-            prefix = CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
-        }
-
-        val kind = kind(severity)
-        if (kind != null) {
-            // Report target when cross-compiling common files
-            if (location != null && kotlinTarget != null && kotlinTarget.isFromIncludedSourceRoot(File(location.path))) {
-                val moduleName = kotlinTarget.module.name
-                prefix += "[$moduleName] "
-            }
-
-            context.processMessage(
-                CompilerMessage(
-                    CompilerRunnerConstants.KOTLIN_COMPILER_NAME,
-                    kind,
-                    prefix + message,
-                    location?.path,
-                    -1, -1, -1,
-                    location?.line?.toLong() ?: -1,
-                    location?.column?.toLong() ?: -1
-                )
-            )
-        } else {
-            val path = if (location != null) "${location.path}:${location.line}:${location.column}: " else ""
-            KotlinBuilder.LOG.debug(path + message)
-        }
-    }
-
-    override fun clear() {
-        hasErrors = false
-    }
-
-    override fun hasErrors(): Boolean = hasErrors
-
-    private fun kind(severity: CompilerMessageSeverity): BuildMessage.Kind? {
-        return when (severity) {
-            CompilerMessageSeverity.INFO -> BuildMessage.Kind.INFO
-            CompilerMessageSeverity.ERROR, CompilerMessageSeverity.EXCEPTION -> BuildMessage.Kind.ERROR
-            CompilerMessageSeverity.WARNING, CompilerMessageSeverity.STRONG_WARNING -> BuildMessage.Kind.WARNING
-            CompilerMessageSeverity.LOGGING -> null
-            else -> throw IllegalArgumentException("Unsupported severity: $severity")
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt
deleted file mode 100644
index 8b4c513f1dee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.ModuleChunk
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicLong
-
-class TeamcityStatisticsLogger {
-    private val isOnTeamcity = System.getenv("TEAMCITY_VERSION") != null
-
-    private val totalTime = AtomicLong()
-
-    //NOTE: mostly copied from TeamCityBuildInfoPrinter
-    private fun escapedChar(c: Char): Char {
-        return when (c) {
-            '\n' -> 'n'
-            '\r' -> 'r'
-            '\u0085' -> 'x' // next-line character
-            '\u2028' -> 'l' // line-separator character
-            '\u2029' -> 'p' // paragraph-separator character
-            '|' -> '|'
-            '\'' -> '\''
-            '[' -> '['
-            ']' -> ']'
-            else -> 0.toChar()
-        }
-    }
-
-    private fun escape(text: String): String {
-        val escaped = StringBuilder()
-        for (c in text.toCharArray()) {
-            val escChar = escapedChar(c)
-            if (escChar == 0.toChar()) {
-                escaped.append(c)
-            } else {
-                escaped.append('|').append(escChar)
-            }
-        }
-
-        return escaped.toString()
-    }
-
-    fun registerStatistic(moduleChunk: ModuleChunk, timeToCompileNs: Long) {
-        if (!isOnTeamcity) return
-
-        totalTime.addAndGet(timeToCompileNs)
-        printPerChunkStatistics(moduleChunk, timeToCompileNs)
-    }
-
-    private fun printPerChunkStatistics(moduleChunk: ModuleChunk, timeToCompileNs: Long) {
-        printStatisticMessage(
-            "${KotlinBuilder.KOTLIN_BUILDER_NAME} for ${moduleChunk.presentableShortName} compilation time, ms",
-            timeToCompileNs.nanosToMillis().toString()
-        )
-    }
-
-    fun reportTotal() {
-        if (!isOnTeamcity) return
-
-        printStatisticMessage(
-            "${KotlinBuilder.KOTLIN_BUILDER_NAME} total compilation time, ms",
-            totalTime.get().nanosToMillis().toString()
-        )
-    }
-
-
-    private fun printStatisticMessage(key: String, value: String) {
-        println("##teamcity[buildStatisticValue key='${escape(key)}' value='${escape(value)}']")
-    }
-
-    private fun Long.nanosToMillis() = TimeUnit.NANOSECONDS.toMillis(this)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt
deleted file mode 100644
index c74d4e0f7ecc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import java.io.File
-
-/**
- * Used for assertions in tests.
- */
-interface TestingBuildLogger {
-    fun invalidOrUnusedCache(chunk: KotlinChunk?, target: KotlinModuleBuildTarget<*>?, attributesDiff: CacheAttributesDiff<*>) = Unit
-    fun chunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) = Unit
-    fun afterChunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) = Unit
-    fun compilingFiles(files: Collection<File>, allRemovedFilesFiles: Collection<File>) = Unit
-    fun addCustomMessage(message: String) = Unit
-    fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) = Unit
-    fun markedAsDirtyBeforeRound(files: Iterable<File>) = Unit
-    fun markedAsDirtyAfterRound(files: Iterable<File>) = Unit
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt
deleted file mode 100644
index 3d2a4d907ea6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.model.JpsElementFactory
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.JpsSimpleElement
-import org.jetbrains.jps.model.ex.JpsElementChildRoleBase
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-
-private val TESTING_CONTEXT = JpsElementChildRoleBase.create<JpsSimpleElement<out TestingContext>>("Testing kcontext")
-
-@TestOnly
-fun JpsProject.setTestingContext(context: TestingContext) {
-    val dataContainer = JpsElementFactory.getInstance().createSimpleElement(context)
-    container.setChild(TESTING_CONTEXT, dataContainer)
-}
-
-val JpsProject.testingContext: TestingContext?
-    get() = container.getChild(TESTING_CONTEXT)?.data
-
-val CompileContext.testingContext: TestingContext?
-    get() = projectDescriptor?.project?.testingContext
-
-class TestingContext(
-    val lookupTracker: LookupTracker,
-    val buildLogger: TestingBuildLogger?
-) {
-    var kotlinCompileContext: KotlinCompileContext? = null
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt
deleted file mode 100644
index 116bb4540983..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.messages.CompilerMessage
-
-fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) {
-    @Suppress("HardCodedStringLiteral")
-    val builderError = CompilerMessage.createInternalBuilderError("Kotlin", error)
-    context.processMessage(builderError)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt
deleted file mode 100644
index e9f533ce3919..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/jpsUtil.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.model.module.JpsModule
-
-fun ModuleChunk.isDummy(context: CompileContext): Boolean {
-    val targetIndex = context.projectDescriptor.buildTargetIndex
-    return targets.all { targetIndex.isDummy(it) }
-}
-
-@Deprecated("Use `kotlin.targetBinding` instead", ReplaceWith("kotlin.targetsBinding"))
-val CompileContext.kotlinBuildTargets
-    get() = kotlin.targetsBinding
-
-fun ModuleChunk.toKotlinChunk(context: CompileContext): KotlinChunk? =
-    context.kotlin.getChunk(this)
-
-fun ModuleBuildTarget(module: JpsModule, isTests: Boolean) =
-    ModuleBuildTarget(
-        module,
-        if (isTests) JavaModuleBuildTargetType.TEST else JavaModuleBuildTargetType.PRODUCTION
-    )
-
-val JpsModule.productionBuildTarget
-    get() = ModuleBuildTarget(this, false)
-
-val JpsModule.testBuildTarget
-    get() = ModuleBuildTarget(this, true)
-
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt
deleted file mode 100644
index e9fa8d383286..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesDiff.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-/**
- * Diff between actual and expected cache attributes.
- * [status] are calculated based on this diff (see [CacheStatus]).
- * Based on that [status] system may perform required actions (i.e. rebuild something, clearing caches, etc...).
- *
- * [CacheAttributesDiff] can be used to cache current attribute values and as facade for version operations.
- */
-data class CacheAttributesDiff<Attrs: Any>(
-    val manager: CacheAttributesManager<Attrs>,
-    val actual: Attrs?,
-    val expected: Attrs?
-) {
-    val status: CacheStatus
-        get() =
-            if (expected != null) {
-                if (actual != null && manager.isCompatible(actual, expected)) CacheStatus.VALID
-                else CacheStatus.INVALID
-            } else {
-                if (actual != null) CacheStatus.SHOULD_BE_CLEARED
-                else CacheStatus.CLEARED
-            }
-
-    override fun toString(): String {
-        return "$status: actual=$actual -> expected=$expected"
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt
deleted file mode 100644
index 88389169cee6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheAttributesManager.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-/**
- * Manages cache attributes values.
- *
- * Attribute values can be loaded by calling [loadActual].
- * Based on loaded actual and fixed [expected] values [CacheAttributesDiff] can be constructed which can calculate [CacheStatus].
- * Build system may perform required actions based on that (i.e. rebuild something, clearing caches, etc...).
- *
- * [CacheAttributesDiff] can be used to cache current attribute values and then can be used as facade for cache version operations.
- */
-interface CacheAttributesManager<Attrs : Any> {
-    /**
-     * Cache attribute values expected by the current version of build system and compiler.
-     * `null` means that cache is not required (incremental compilation is disabled).
-     */
-    val expected: Attrs?
-
-    /**
-     * Load actual cache attribute values.
-     * `null` means that cache is not yet created.
-     *
-     * This is internal operation that should be implemented by particular implementation of CacheAttributesManager.
-     * Consider using `loadDiff().actual` for getting actual values.
-     */
-    fun loadActual(): Attrs?
-
-    /**
-     * Write [values] as cache attributes for next build execution.
-     */
-    fun writeVersion(values: Attrs? = expected)
-
-    /**
-     * Check if cache with [actual] attributes values can be used when [expected] attributes are required.
-     */
-    fun isCompatible(actual: Attrs, expected: Attrs): Boolean = actual == expected
-}
-
-fun <Attrs : Any> CacheAttributesManager<Attrs>.loadDiff(
-    actual: Attrs? = this.loadActual(),
-    expected: Attrs? = this.expected
-) = CacheAttributesDiff(this, actual, expected)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt
deleted file mode 100644
index 0359e08c6082..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheStatus.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-/**
- * Status that is used by system to perform required actions (i.e. rebuild something, clearing caches, etc...).
- */
-enum class CacheStatus {
-    /**
-     * Cache is valid and ready to use.
-     */
-    VALID,
-
-    /**
-     * Cache is not exists or have outdated versions and/or other attributes.
-     */
-    INVALID,
-
-    /**
-     * Cache is exists, but not required anymore.
-     */
-    SHOULD_BE_CLEARED,
-
-    /**
-     * Cache is not exists and not required.
-     */
-    CLEARED
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt
deleted file mode 100644
index 107b181d28bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import java.io.File
-import java.io.IOException
-import java.nio.file.Path
-import kotlin.io.path.*
-
-/**
- * Manages files with actual version [loadActual] and provides expected version [expected].
- * Based on that actual and expected versions [CacheStatus] can be calculated.
- * This can be done by constructing [CacheAttributesDiff] and calling [CacheAttributesDiff.status].
- * Based on that status system may perform required actions (i.e. rebuild something, clearing caches, etc...).
- */
-class CacheVersionManager(
-    private val versionFile: Path,
-    expectedOwnVersion: Int?
-) : CacheAttributesManager<CacheVersion> {
-    override val expected: CacheVersion? =
-        if (expectedOwnVersion == null) null
-        else CacheVersion(expectedOwnVersion, JvmBytecodeBinaryVersion.INSTANCE, JvmMetadataVersion.INSTANCE)
-
-    override fun loadActual(): CacheVersion? =
-        if (versionFile.notExists()) null
-        else try {
-            CacheVersion(versionFile.readText().toInt())
-        } catch (e: NumberFormatException) {
-            null
-        } catch (e: IOException) {
-            null
-        }
-
-    override fun writeVersion(values: CacheVersion?) {
-        if (values == null) versionFile.deleteIfExists()
-        else {
-            versionFile.parent.createDirectories()
-            versionFile.writeText(values.intValue.toString())
-        }
-    }
-
-    @get:TestOnly
-    val versionFileForTesting: File
-        get() = versionFile.toFile()
-}
-
-fun CacheVersion(own: Int, bytecode: JvmBytecodeBinaryVersion, metadata: JvmMetadataVersion): CacheVersion {
-    require(own in 0 until Int.MAX_VALUE / 1000000)
-    require(bytecode.major in 0..9)
-    require(bytecode.minor in 0..9)
-    require(metadata.major in 0..9)
-    require(metadata.minor in 0..99)
-
-    return CacheVersion(
-        own * 1000000 +
-                bytecode.major * 10000 + bytecode.minor * 100 +
-                metadata.major * 1000 + metadata.minor
-    )
-}
-
-data class CacheVersion(val intValue: Int) {
-    val own: Int
-        get() = intValue / 1000000
-
-    val bytecode: JvmBytecodeBinaryVersion
-        get() = JvmBytecodeBinaryVersion(
-            intValue / 10000 % 10,
-            intValue / 100 % 10
-        )
-
-    val metadata: JvmMetadataVersion
-        get() = JvmMetadataVersion(
-            intValue / 1000 % 10,
-            intValue / 1 % 100
-        )
-
-    override fun toString(): String = "CacheVersion(caches: $own, bytecode: $bytecode, metadata: $metadata)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
deleted file mode 100644
index 45e339e5725f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributes.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.annotations.TestOnly
-import java.io.IOException
-import java.nio.file.Path
-import kotlin.io.path.*
-
-/**
- * Attributes manager for global lookups cache that may contain lookups for several compilers (jvm, js).
- * Works by delegating to [lookupsCacheVersionManager] and managing additional file with list of executed compilers (cache components).
- *
- * TODO(1.2.80): got rid of shared lookup cache, replace with individual lookup cache for each compiler
- */
-class CompositeLookupsCacheAttributesManager(
-    rootPath: Path,
-    expectedComponents: Set<String>
-) : CacheAttributesManager<CompositeLookupsCacheAttributes> {
-    private val versionManager = lookupsCacheVersionManager(
-        rootPath,
-        expectedComponents.isNotEmpty()
-    )
-
-    private val actualComponentsFile = rootPath.resolve("components.txt")
-
-    override val expected: CompositeLookupsCacheAttributes? =
-        if (expectedComponents.isEmpty()) null
-        else CompositeLookupsCacheAttributes(versionManager.expected!!.intValue, expectedComponents)
-
-    override fun loadActual(): CompositeLookupsCacheAttributes? {
-        val version = versionManager.loadActual() ?: return null
-
-        if (actualComponentsFile.notExists()) return null
-
-        val components = try {
-            actualComponentsFile.readLines().toSet()
-        } catch (e: IOException) {
-            return null
-        }
-
-        return CompositeLookupsCacheAttributes(version.intValue, components)
-    }
-
-    override fun writeVersion(values: CompositeLookupsCacheAttributes?) {
-        if (values == null) {
-            versionManager.writeVersion(null)
-            actualComponentsFile.deleteIfExists()
-        } else {
-            versionManager.writeVersion(CacheVersion(values.version))
-
-            actualComponentsFile.parent.createDirectories()
-            actualComponentsFile.writeText(values.components.joinToString("\n"))
-        }
-    }
-
-    override fun isCompatible(actual: CompositeLookupsCacheAttributes, expected: CompositeLookupsCacheAttributes): Boolean {
-        // cache can be reused when all required (expected) components are present
-        // (components that are not required anymore are not not interfere)
-        return actual.version == expected.version && actual.components.containsAll(expected.components)
-    }
-
-    @get:TestOnly
-    val versionManagerForTesting
-        get() = versionManager
-}
-
-data class CompositeLookupsCacheAttributes(
-    val version: Int,
-    val components: Set<String>
-) {
-    override fun toString() = "($version, $components)"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCache.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCache.kt
deleted file mode 100644
index e2fc17ab9966..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCache.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.builders.storage.StorageProvider
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.storage.BuildDataManager
-import org.jetbrains.jps.incremental.storage.StorageOwner
-import org.jetbrains.kotlin.incremental.IncrementalCacheCommon
-import org.jetbrains.kotlin.incremental.IncrementalJsCache
-import org.jetbrains.kotlin.incremental.IncrementalJvmCache
-import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
-import org.jetbrains.kotlin.jps.build.KotlinBuilder
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
-import java.io.File
-
-interface JpsIncrementalCache : IncrementalCacheCommon, StorageOwner {
-    fun addJpsDependentCache(cache: JpsIncrementalCache)
-}
-
-class JpsIncrementalJvmCache(
-    target: ModuleBuildTarget,
-    paths: BuildDataPaths,
-    pathConverter: FileToPathConverter
-) : IncrementalJvmCache(paths.getTargetDataRoot(target), target.outputDir, pathConverter), JpsIncrementalCache {
-    override fun addJpsDependentCache(cache: JpsIncrementalCache) {
-        if (cache is JpsIncrementalJvmCache) {
-            addDependentCache(cache)
-        }
-    }
-
-    override fun debugLog(message: String) {
-        KotlinBuilder.LOG.debug(message)
-    }
-}
-
-class JpsIncrementalJsCache(
-    target: ModuleBuildTarget,
-    paths: BuildDataPaths,
-    pathConverter: FileToPathConverter
-) : IncrementalJsCache(paths.getTargetDataRoot(target), pathConverter, JsSerializerProtocol), JpsIncrementalCache {
-    override fun addJpsDependentCache(cache: JpsIncrementalCache) {
-        if (cache is JpsIncrementalJsCache) {
-            addDependentCache(cache)
-        }
-    }
-}
-
-private class KotlinIncrementalStorageProvider(
-    private val target: KotlinModuleBuildTarget<*>,
-    private val paths: BuildDataPaths
-) : StorageProvider<JpsIncrementalCache>() {
-    init {
-        check(target.hasCaches)
-    }
-
-    override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target
-
-    override fun hashCode() = target.hashCode()
-
-    override fun createStorage(targetDataDir: File): JpsIncrementalCache = target.createCacheStorage(paths)
-}
-
-fun BuildDataManager.getKotlinCache(target: KotlinModuleBuildTarget<*>?): JpsIncrementalCache? =
-    if (target == null || !target.hasCaches) null
-    else getStorage(target.jpsModuleBuildTarget, KotlinIncrementalStorageProvider(target, dataPaths))
-
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt
deleted file mode 100644
index a6fb793038ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.jps.builders.storage.BuildDataCorruptedException
-import org.jetbrains.jps.builders.storage.StorageProvider
-import org.jetbrains.jps.incremental.storage.BuildDataManager
-import org.jetbrains.jps.incremental.storage.StorageOwner
-import org.jetbrains.kotlin.incremental.LookupStorage
-import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
-import java.io.File
-import java.io.IOException
-
-private object LookupStorageLock
-
-class JpsLookupStorageManager(
-    private val buildDataManager: BuildDataManager,
-    pathConverter: FileToPathConverter
-) {
-    private val storageProvider = JpsLookupStorageProvider(pathConverter)
-
-    fun cleanLookupStorage(log: Logger) {
-        synchronized(LookupStorageLock) {
-            try {
-                buildDataManager.cleanTargetStorages(KotlinDataContainerTarget)
-            } catch (e: IOException) {
-                if (!buildDataManager.dataPaths.getTargetDataRoot(KotlinDataContainerTarget).deleteRecursively()) {
-                    log.debug("Could not clear lookup storage caches", e)
-                }
-            }
-        }
-    }
-
-    fun <T> withLookupStorage(fn: (LookupStorage) -> T): T {
-        synchronized(LookupStorageLock) {
-            try {
-                val lookupStorage = buildDataManager.getStorage(KotlinDataContainerTarget, storageProvider)
-                return fn(lookupStorage)
-            } catch (e: IOException) {
-                throw BuildDataCorruptedException(e)
-            }
-        }
-    }
-
-    private class JpsLookupStorageProvider(
-        private val pathConverter: FileToPathConverter
-    ) : StorageProvider<JpsLookupStorage>() {
-        override fun createStorage(targetDataDir: File): JpsLookupStorage =
-            JpsLookupStorage(targetDataDir, pathConverter)
-    }
-
-    private class JpsLookupStorage(
-        targetDataDir: File,
-        pathConverter: FileToPathConverter
-    ) : StorageOwner, LookupStorage(targetDataDir, pathConverter)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinCompilerReferenceIndexBuilder.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinCompilerReferenceIndexBuilder.kt
deleted file mode 100644
index be6b9a9e3f81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinCompilerReferenceIndexBuilder.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.BuildTargetRegistry
-import org.jetbrains.jps.builders.DirtyFilesHolder
-import org.jetbrains.jps.builders.JpsBuildBundle
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.incremental.BuilderCategory
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.jps.incremental.messages.CustomBuilderMessage
-import org.jetbrains.kotlin.config.SettingConstants
-
-/**
- * Based on [org.jetbrains.jps.backwardRefs.JavaBackwardReferenceIndexBuilder]
- */
-class KotlinCompilerReferenceIndexBuilder : ModuleLevelBuilder(BuilderCategory.CLASS_POST_PROCESSOR) {
-    private val compiledTargets = ContainerUtil.newConcurrentSet<ModuleBuildTarget>()
-
-    override fun getPresentableName(): String = JpsBuildBundle.message("builder.name.backward.references.indexer")
-
-    override fun build(
-        context: CompileContext,
-        chunk: ModuleChunk,
-        dirtyFilesHolder: DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget>,
-        outputConsumer: OutputConsumer,
-    ): ExitCode = ExitCode.OK.also {
-        chunk.targets.mapNotNullTo(compiledTargets) { buildTarget ->
-            buildTarget.takeIf { context.scope.isWholeTargetAffected(it) }
-        }
-    }
-
-    override fun buildFinished(context: CompileContext) {
-        val targetIndex = context.projectDescriptor.buildTargetIndex
-        for (module in context.projectDescriptor.project.modules) {
-            val allAreDummyOrCompiled = targetIndex.getModuleBasedTargets(module, BuildTargetRegistry.ModuleTargetSelector.ALL)
-                .none { target -> target is ModuleBuildTarget && target !in compiledTargets && !targetIndex.isDummy(target) }
-
-            if (allAreDummyOrCompiled) {
-                context.processMessage(
-                    CustomBuilderMessage(SettingConstants.KOTLIN_COMPILER_REFERENCE_INDEX_BUILDER_ID, MESSAGE_TYPE, module.name)
-                )
-            }
-        }
-
-        compiledTargets.clear()
-    }
-
-    override fun getCompilableFileExtensions(): List<String> = emptyList()
-
-    companion object {
-        private const val MESSAGE_TYPE = "processed module"
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt
deleted file mode 100644
index d45aa24dafac..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.jps.builders.*
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.indices.IgnoredFileIndex
-import org.jetbrains.jps.indices.ModuleExcludeIndex
-import org.jetbrains.jps.model.JpsModel
-import org.jetbrains.kotlin.config.SettingConstants
-import java.io.File
-
-object KotlinDataContainerTargetType : BuildTargetType<KotlinDataContainerTarget>(SettingConstants.KOTLIN_DATA_CONTAINER_ID) {
-    override fun computeAllTargets(model: JpsModel): List<KotlinDataContainerTarget> = listOf(KotlinDataContainerTarget)
-
-    override fun createLoader(model: JpsModel): BuildTargetLoader<KotlinDataContainerTarget> =
-        object : BuildTargetLoader<KotlinDataContainerTarget>() {
-            override fun createTarget(targetId: String): KotlinDataContainerTarget = KotlinDataContainerTarget
-        }
-}
-
-// Fake target to store data per project for incremental compilation
-object KotlinDataContainerTarget : BuildTarget<BuildRootDescriptor>(KotlinDataContainerTargetType) {
-    override fun getId(): String = SettingConstants.KOTLIN_DATA_CONTAINER_ID
-    override fun getPresentableName(): String = SettingConstants.KOTLIN_DATA_CONTAINER_ID
-
-    override fun computeRootDescriptors(
-        model: JpsModel?,
-        index: ModuleExcludeIndex?,
-        ignoredFileIndex: IgnoredFileIndex?,
-        dataPaths: BuildDataPaths?
-    ): List<BuildRootDescriptor> = listOf()
-
-    override fun getOutputRoots(context: CompileContext): Collection<File> {
-        val dataManager = context.projectDescriptor.dataManager
-        val storageRoot = dataManager.dataPaths.dataStorageRoot
-        return listOf(File(storageRoot, SettingConstants.KOTLIN_DATA_CONTAINER_ID))
-    }
-
-    override fun findRootDescriptor(rootId: String?, rootIndex: BuildRootIndex?): BuildRootDescriptor? = null
-
-    override fun computeDependencies(
-        targetRegistry: BuildTargetRegistry?,
-        outputIndex: TargetOutputIndex?
-    ): Collection<BuildTarget<*>> = listOf()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
deleted file mode 100644
index 6716fa4c4b7a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import java.nio.file.Path
-
-private const val NORMAL_VERSION = 15
-private const val NORMAL_VERSION_FILE_NAME = "format-version.txt"
-
-fun localCacheVersionManager(dataRoot: Path, isCachesEnabled: Boolean) = CacheVersionManager(
-    dataRoot.resolve(NORMAL_VERSION_FILE_NAME),
-    if (isCachesEnabled) NORMAL_VERSION else null
-)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt
deleted file mode 100644
index d96c93038a58..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import java.nio.file.Path
-
-private const val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt"
-private const val DATA_CONTAINER_VERSION = 6
-
-fun lookupsCacheVersionManager(dataRoot: Path, isEnabled: Boolean) = CacheVersionManager(
-    dataRoot.resolve(DATA_CONTAINER_VERSION_FILE_NAME),
-    if (isEnabled) DATA_CONTAINER_VERSION else null
-)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt
deleted file mode 100644
index 2b5da2b90b61..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental.storages
-
-import com.intellij.util.containers.CollectionFactory
-import com.intellij.util.io.IOUtil
-import com.intellij.util.io.KeyDescriptor
-import org.jetbrains.jps.incremental.storage.PathStringDescriptor
-import org.jetbrains.kotlin.incremental.storage.CollectionExternalizer
-import java.io.DataInput
-import java.io.DataOutput
-
-object PathFunctionPairKeyDescriptor : KeyDescriptor<PathFunctionPair> {
-    override fun read(input: DataInput): PathFunctionPair {
-        val path = IOUtil.readUTF(input)
-        val function = IOUtil.readUTF(input)
-        return PathFunctionPair(path, function)
-    }
-
-    override fun save(output: DataOutput, value: PathFunctionPair) {
-        IOUtil.writeUTF(output, value.path)
-        IOUtil.writeUTF(output, value.function)
-    }
-
-    override fun getHashCode(value: PathFunctionPair): Int = value.hashCode()
-
-    override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = val1 == val2
-}
-
-object PathCollectionExternalizer : CollectionExternalizer<String>(PathStringDescriptor(), { CollectionFactory.createFilePathSet() })
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt
deleted file mode 100644
index 33860e161ca2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental.storages
-
-import com.intellij.openapi.util.io.FileUtil
-
-class PathFunctionPair(
-    val path: String,
-    val function: String
-) : Comparable<PathFunctionPair> {
-    override fun compareTo(other: PathFunctionPair): Int {
-        val pathComp = FileUtil.comparePaths(path, other.path)
-
-        if (pathComp != 0) return pathComp
-
-        return function.compareTo(other.function)
-    }
-
-    override fun equals(other: Any?): Boolean =
-        when (other) {
-            is PathFunctionPair ->
-                FileUtil.pathsEqual(path, other.path) && function == other.function
-            else ->
-                false
-        }
-
-    override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
deleted file mode 100644
index adb9473fda91..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ModuleSettings.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.model
-
-import org.jetbrains.jps.model.ex.JpsElementBase
-import org.jetbrains.jps.model.ex.JpsElementChildRoleBase
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.platform.TargetPlatform
-
-val JpsModule.kotlinFacet: JpsKotlinFacetModuleExtension?
-    get() = container.getChild(JpsKotlinFacetModuleExtension.KIND)
-
-val JpsModule.platform: TargetPlatform?
-    get() = kotlinFacet?.settings?.targetPlatform
-
-val JpsModule.kotlinKind: KotlinModuleKind
-    get() = kotlinFacet?.settings?.kind ?: KotlinModuleKind.DEFAULT
-
-val JpsModule.isTestModule: Boolean
-    get() = kotlinFacet?.settings?.isTestModule ?: false
-
-/**
- * Modules which is imported from sources sets of the compilation represented by this module.
- * This module is not included.
- */
-val JpsModule.sourceSetModules: List<JpsModule>
-    get() = findDependencies(kotlinFacet?.settings?.sourceSetNames)
-
-/**
- * Legacy. List of modules with `expectedBy` dependency.
- */
-val JpsModule.expectedByModules: List<JpsModule>
-    get() = findDependencies(kotlinFacet?.settings?.implementedModuleNames)
-
-private fun JpsModule.findDependencies(moduleNames: List<String>?): List<JpsModule> {
-    if (moduleNames == null || moduleNames.isEmpty()) return listOf()
-
-    val result = mutableSetOf<JpsModule>()
-
-    JpsJavaExtensionService.dependencies(this)
-        .processModules {
-            if (it.name in moduleNames) {
-                // Note, production sources should be added for both production and tests targets
-                result.add(it)
-            }
-        }
-
-    return result.toList()
-}
-
-val JpsModule.productionOutputFilePath: String?
-    get() {
-        val facetSettings = kotlinFacet?.settings ?: return null
-        if (facetSettings.useProjectSettings) return null
-        return facetSettings.productionOutputPath
-    }
-
-val JpsModule.testOutputFilePath: String?
-    get() {
-        val facetSettings = kotlinFacet?.settings ?: return null
-        if (facetSettings.useProjectSettings) return null
-        return facetSettings.testOutputPath
-    }
-
-val JpsModule.kotlinCompilerSettings: CompilerSettings
-    get() {
-        val defaultSettings = copyBean(project.kotlinCompilerSettings)
-        val facetSettings = kotlinFacet?.settings ?: return defaultSettings
-        if (facetSettings.useProjectSettings) return defaultSettings
-        return facetSettings.compilerSettings ?: defaultSettings
-    }
-
-val JpsModule.kotlinCompilerArguments
-    get() = getCompilerArguments<CommonCompilerArguments>()
-
-val JpsModule.k2MetadataCompilerArguments
-    get() = getCompilerArguments<K2MetadataCompilerArguments>()
-
-val JpsModule.k2JsCompilerArguments
-    get() = getCompilerArguments<K2JSCompilerArguments>()
-
-val JpsModule.k2JvmCompilerArguments
-    get() = getCompilerArguments<K2JVMCompilerArguments>()
-
-private inline fun <reified T : CommonCompilerArguments> JpsModule.getCompilerArguments(): T {
-    val projectSettings = project.kotlinCompilerSettingsContainer[T::class.java]
-    val projectSettingsCopy = copyBean(projectSettings)
-
-    val facetSettings = kotlinFacet?.settings ?: return projectSettingsCopy
-    if (facetSettings.useProjectSettings) return projectSettingsCopy
-    facetSettings.updateMergedArguments()
-    return facetSettings.mergedCompilerArguments as? T ?: projectSettingsCopy
-}
-
-class JpsKotlinFacetModuleExtension(settings: KotlinFacetSettings) : JpsElementBase<JpsKotlinFacetModuleExtension>() {
-    var settings = settings
-        private set
-
-    companion object {
-        val KIND = JpsElementChildRoleBase.create<JpsKotlinFacetModuleExtension>("kotlin facet extension")
-        // These must be changed in sync with KotlinFacetType.TYPE_ID and KotlinFacetType.NAME
-        val FACET_TYPE_ID = "kotlin-language"
-        val FACET_NAME = "Kotlin"
-    }
-
-    override fun createCopy() = JpsKotlinFacetModuleExtension(settings)
-
-    override fun applyChanges(modified: JpsKotlinFacetModuleExtension) {
-        this.settings = modified.settings
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ProjectSettings.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ProjectSettings.kt
deleted file mode 100644
index 7e68f2399fe8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/ProjectSettings.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.model
-
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.ex.JpsElementBase
-import org.jetbrains.jps.model.ex.JpsElementChildRoleBase
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.config.CompilerSettings
-
-var JpsProject.kotlinCompilerSettings
-    get() = kotlinCompilerSettingsContainer.compilerSettings
-    internal set(value) {
-        getOrCreateSettings().compilerSettings = value
-    }
-
-var JpsProject.kotlinCommonCompilerArguments
-    get() = kotlinCompilerSettingsContainer.commonCompilerArguments
-    /*internal */set(value) {
-        getOrCreateSettings().commonCompilerArguments = value
-    }
-
-var JpsProject.k2MetadataCompilerArguments
-    get() = kotlinCompilerSettingsContainer.k2MetadataCompilerArguments
-    internal set(value) {
-        getOrCreateSettings().k2MetadataCompilerArguments = value
-    }
-
-var JpsProject.k2JsCompilerArguments
-    get() = kotlinCompilerSettingsContainer.k2JsCompilerArguments
-    internal set(value) {
-        getOrCreateSettings().k2JsCompilerArguments = value
-    }
-
-var JpsProject.k2JvmCompilerArguments
-    get() = kotlinCompilerSettingsContainer.k2JvmCompilerArguments
-    /*internal */set(value) {
-        getOrCreateSettings().k2JvmCompilerArguments = value
-    }
-
-internal val JpsProject.kotlinCompilerSettingsContainer
-    get() = container.getChild(JpsKotlinCompilerSettings.ROLE) ?: JpsKotlinCompilerSettings()
-
-private fun JpsProject.getOrCreateSettings(): JpsKotlinCompilerSettings {
-    var settings = container.getChild(JpsKotlinCompilerSettings.ROLE)
-    if (settings == null) {
-        settings = JpsKotlinCompilerSettings()
-        container.setChild(JpsKotlinCompilerSettings.ROLE, settings)
-    }
-    return settings
-}
-
-class JpsKotlinCompilerSettings : JpsElementBase<JpsKotlinCompilerSettings>() {
-    internal var commonCompilerArguments: CommonCompilerArguments = CommonCompilerArguments.DummyImpl()
-    internal var k2MetadataCompilerArguments = K2MetadataCompilerArguments()
-    internal var k2JvmCompilerArguments = K2JVMCompilerArguments()
-    internal var k2JsCompilerArguments = K2JSCompilerArguments()
-    internal var compilerSettings = CompilerSettings()
-
-    @Suppress("UNCHECKED_CAST")
-    internal operator fun <T : CommonCompilerArguments> get(compilerArgumentsClass: Class<T>): T = when (compilerArgumentsClass) {
-        K2MetadataCompilerArguments::class.java -> k2MetadataCompilerArguments as T
-        K2JVMCompilerArguments::class.java -> k2JvmCompilerArguments as T
-        K2JSCompilerArguments::class.java -> k2JsCompilerArguments as T
-        else -> commonCompilerArguments as T
-    }
-
-    override fun createCopy(): JpsKotlinCompilerSettings {
-        val copy = JpsKotlinCompilerSettings()
-        copy.commonCompilerArguments = this.commonCompilerArguments
-        copy.k2MetadataCompilerArguments = this.k2MetadataCompilerArguments
-        copy.k2JvmCompilerArguments = this.k2JvmCompilerArguments
-        copy.k2JsCompilerArguments = this.k2JsCompilerArguments
-        copy.compilerSettings = this.compilerSettings
-        return copy
-    }
-
-    override fun applyChanges(modified: JpsKotlinCompilerSettings) {
-        // do nothing
-    }
-
-    companion object {
-        internal val ROLE = JpsElementChildRoleBase.create<JpsKotlinCompilerSettings>("Kotlin Compiler Settings")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
deleted file mode 100644
index b0353c5980a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.model
-
-import com.intellij.util.xmlb.XmlSerializer
-import org.jdom.Element
-import org.jetbrains.jps.model.JpsElement
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer
-import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded
-import org.jetbrains.kotlin.config.*
-import java.util.*
-
-class KotlinModelSerializerService : KotlinCommonJpsModelSerializerExtension() {
-    override fun getProjectExtensionSerializers() = listOf(
-        KotlinCommonCompilerArgumentsSerializer(),
-        Kotlin2JvmCompilerArgumentsSerializer(),
-        Kotlin2JsCompilerArgumentsSerializer(),
-        KotlinCompilerSettingsSerializer()
-    )
-
-    override fun getFacetConfigurationSerializers() = listOf(JpsKotlinFacetConfigurationSerializer)
-}
-
-object JpsKotlinFacetConfigurationSerializer : JpsFacetConfigurationSerializer<JpsKotlinFacetModuleExtension>(
-    JpsKotlinFacetModuleExtension.KIND,
-    JpsKotlinFacetModuleExtension.FACET_TYPE_ID,
-    JpsKotlinFacetModuleExtension.FACET_NAME
-) {
-    override fun loadExtension(
-        facetConfigurationElement: Element,
-        name: String,
-        parent: JpsElement?,
-        module: JpsModule
-    ): JpsKotlinFacetModuleExtension {
-        return JpsKotlinFacetModuleExtension(deserializeFacetSettings(facetConfigurationElement))
-    }
-
-    override fun saveExtension(
-        extension: JpsKotlinFacetModuleExtension?,
-        facetConfigurationTag: Element,
-        module: JpsModule
-    ) {
-        (extension as JpsKotlinFacetModuleExtension).settings.serializeFacetSettings(facetConfigurationTag)
-    }
-}
-
-abstract class BaseJpsCompilerSettingsSerializer<in T : Any>(
-    componentName: String,
-    private val settingsFactory: () -> T
-) : JpsProjectExtensionSerializer(SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE, componentName) {
-    protected abstract fun onLoad(project: JpsProject, settings: T)
-
-    override fun loadExtension(project: JpsProject, componentTag: Element) {
-        val settings = settingsFactory().apply {
-            if (this is CommonCompilerArguments) {
-                freeArgs = ArrayList()
-            }
-        }
-        XmlSerializer.deserializeInto(settings, componentTag)
-        onLoad(project, settings)
-    }
-
-    override fun saveExtension(project: JpsProject, componentTag: Element) {
-    }
-}
-
-internal class KotlinCompilerSettingsSerializer : BaseJpsCompilerSettingsSerializer<CompilerSettings>(
-    SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION, ::CompilerSettings
-) {
-    override fun onLoad(project: JpsProject, settings: CompilerSettings) {
-        project.kotlinCompilerSettings = settings
-    }
-}
-
-internal class KotlinCommonCompilerArgumentsSerializer : BaseJpsCompilerSettingsSerializer<CommonCompilerArguments.DummyImpl>(
-    SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION, CommonCompilerArguments::DummyImpl
-) {
-    override fun onLoad(project: JpsProject, settings: CommonCompilerArguments.DummyImpl) {
-        settings.setApiVersionToLanguageVersionIfNeeded()
-        project.kotlinCommonCompilerArguments = settings
-    }
-}
-
-internal class Kotlin2JsCompilerArgumentsSerializer : BaseJpsCompilerSettingsSerializer<K2JSCompilerArguments>(
-    SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION, ::K2JSCompilerArguments
-) {
-    override fun onLoad(project: JpsProject, settings: K2JSCompilerArguments) {
-        project.k2JsCompilerArguments = settings
-    }
-}
-
-internal class Kotlin2JvmCompilerArgumentsSerializer : BaseJpsCompilerSettingsSerializer<K2JVMCompilerArguments>(
-    SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION, ::K2JVMCompilerArguments
-) {
-    override fun onLoad(project: JpsProject, settings: K2JVMCompilerArguments) {
-        project.k2JvmCompilerArguments = settings
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinCommonModuleBuildTarget.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinCommonModuleBuildTarget.kt
deleted file mode 100644
index e7e99f8ccb62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinCommonModuleBuildTarget.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.targets
-
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.build.CommonBuildMetaInfo
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.jps.build.KotlinCompileContext
-import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
-import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
-import org.jetbrains.kotlin.jps.model.k2MetadataCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinCompilerSettings
-
-private const val COMMON_BUILD_META_INFO_FILE_NAME = "common-build-meta-info.txt"
-
-class KotlinCommonModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBuildTarget: ModuleBuildTarget) :
-    KotlinModuleBuildTarget<CommonBuildMetaInfo>(kotlinContext, jpsModuleBuildTarget) {
-
-    override fun isEnabled(chunkCompilerArguments: CommonCompilerArguments): Boolean {
-        val k2MetadataArguments = module.k2MetadataCompilerArguments
-        return k2MetadataArguments.enabledInJps || (chunkCompilerArguments as? K2MetadataCompilerArguments)?.enabledInJps == true
-    }
-
-    override val isIncrementalCompilationEnabled: Boolean
-        get() = false
-
-    override val buildMetaInfoFactory
-        get() = CommonBuildMetaInfo
-
-    override val buildMetaInfoFileName
-        get() = COMMON_BUILD_META_INFO_FILE_NAME
-
-    override val globalLookupCacheId: String
-        get() = "metadata-compiler"
-
-    override fun compileModuleChunk(
-        commonArguments: CommonCompilerArguments,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        environment: JpsCompilerEnvironment
-    ): Boolean {
-        require(chunk.representativeTarget == this)
-
-        reportAndSkipCircular(environment)
-
-        JpsKotlinCompilerRunner().runK2MetadataCompiler(
-            commonArguments,
-            module.k2MetadataCompilerArguments,
-            module.kotlinCompilerSettings,
-            environment,
-            destination,
-            dependenciesOutputDirs + libraryFiles,
-            sourceFiles // incremental K2MetadataCompiler not supported yet
-        )
-
-        return true
-    }
-
-    private val libraryFiles: List<String>
-        get() = mutableListOf<String>().also { result ->
-            for (library in allDependencies.libraries) {
-                for (root in library.getRoots(JpsOrderRootType.COMPILED)) {
-                    result.add(JpsPathUtil.urlToPath(root.url))
-                }
-            }
-        }
-
-    private val dependenciesOutputDirs: List<String>
-        get() = mutableListOf<String>().also { result ->
-            allDependencies.processModules { module ->
-                if (isTests) addDependencyMetaFile(module, result, isTests = true)
-
-                // note: production targets should be also added as dependency to test targets
-                addDependencyMetaFile(module, result, isTests = false)
-            }
-        }
-
-    val destination: String
-        get() = module.k2MetadataCompilerArguments.destination ?: outputDir.absolutePath
-
-    private fun addDependencyMetaFile(
-        module: JpsModule,
-        result: MutableList<String>,
-        isTests: Boolean
-    ) {
-        val dependencyBuildTarget = kotlinContext.targetsBinding[ModuleBuildTarget(module, isTests)]
-
-        if (dependencyBuildTarget != this@KotlinCommonModuleBuildTarget &&
-            dependencyBuildTarget is KotlinCommonModuleBuildTarget &&
-            dependencyBuildTarget.sources.isNotEmpty()
-        ) {
-            result.add(dependencyBuildTarget.destination)
-        }
-    }
-
-    override val hasCaches: Boolean
-        get() = false
-
-    override fun createCacheStorage(paths: BuildDataPaths) =
-        error("incremental K2MetadataCompiler not supported yet, createCacheStorage() should not be called")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJsModuleBuildTarget.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJsModuleBuildTarget.kt
deleted file mode 100644
index 0118ada61ddc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJsModuleBuildTarget.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.targets
-
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.build.GeneratedFile
-import org.jetbrains.kotlin.build.JsBuildMetaInfo
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.incremental.ChangesCollector
-import org.jetbrains.kotlin.incremental.IncrementalJsCache
-import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
-import org.jetbrains.kotlin.incremental.components.InlineConstTracker
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
-import org.jetbrains.kotlin.incremental.js.IncrementalDataProviderFromCache
-import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
-import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
-import org.jetbrains.kotlin.jps.build.KotlinCompileContext
-import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
-import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalJsCache
-import org.jetbrains.kotlin.jps.model.k2JsCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinCompilerSettings
-import org.jetbrains.kotlin.jps.model.productionOutputFilePath
-import org.jetbrains.kotlin.jps.model.testOutputFilePath
-import org.jetbrains.kotlin.utils.JsLibraryUtils
-import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils.JS_EXT
-import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils.META_JS_SUFFIX
-import java.io.File
-import java.net.URI
-import kotlin.io.path.absolute
-import kotlin.io.path.exists
-import kotlin.io.path.pathString
-
-private const val JS_BUILD_META_INFO_FILE_NAME = "js-build-meta-info.txt"
-
-class KotlinJsModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBuildTarget: ModuleBuildTarget) :
-    KotlinModuleBuildTarget<JsBuildMetaInfo>(kotlinContext, jpsModuleBuildTarget) {
-    override val globalLookupCacheId: String
-        get() = "js"
-
-    override val isIncrementalCompilationEnabled: Boolean
-        get() = IncrementalCompilation.isEnabledForJs()
-
-    override val buildMetaInfoFactory
-        get() = JsBuildMetaInfo
-
-    override val buildMetaInfoFileName: String
-        get() = JS_BUILD_META_INFO_FILE_NAME
-
-    val isFirstBuild: Boolean
-        get() {
-            val targetDataRoot = jpsGlobalContext.projectDescriptor.dataManager.dataPaths.getTargetDataRoot(jpsModuleBuildTarget)
-            return !IncrementalJsCache.hasHeaderFile(targetDataRoot)
-        }
-
-    override fun makeServices(
-        builder: Services.Builder,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        lookupTracker: LookupTracker,
-        exceptActualTracer: ExpectActualTracker,
-        inlineConstTracker: InlineConstTracker
-    ) {
-        super.makeServices(builder, incrementalCaches, lookupTracker, exceptActualTracer, inlineConstTracker)
-
-        with(builder) {
-            register(IncrementalResultsConsumer::class.java, IncrementalResultsConsumerImpl())
-
-            if (isIncrementalCompilationEnabled && !isFirstBuild) {
-                val cache = incrementalCaches[this@KotlinJsModuleBuildTarget] as IncrementalJsCache
-
-                register(
-                    IncrementalDataProvider::class.java,
-                    IncrementalDataProviderFromCache(cache)
-                )
-            }
-        }
-    }
-
-    override fun compileModuleChunk(
-        commonArguments: CommonCompilerArguments,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        environment: JpsCompilerEnvironment
-    ): Boolean {
-        require(chunk.representativeTarget == this)
-
-        if (reportAndSkipCircular(environment)) return false
-
-        val sources = collectSourcesToCompile(dirtyFilesHolder)
-
-        if (!sources.logFiles()) {
-            return false
-        }
-
-        val libraries = libraryFiles + dependenciesMetaFiles
-
-        JpsKotlinCompilerRunner().runK2JsCompiler(
-            commonArguments,
-            module.k2JsCompilerArguments,
-            module.kotlinCompilerSettings,
-            environment,
-            sources.allFiles,
-            sources.crossCompiledFiles,
-            sourceMapRoots,
-            libraries,
-            friendBuildTargetsMetaFiles,
-            outputFile
-        )
-
-        return true
-    }
-
-    override fun doAfterBuild() {
-        copyJsLibraryFilesIfNeeded()
-    }
-
-    private fun copyJsLibraryFilesIfNeeded() {
-        if (module.kotlinCompilerSettings.copyJsLibraryFiles) {
-            val outputLibraryRuntimeDirectory = File(outputDir, module.kotlinCompilerSettings.outputDirectoryForJsLibraryFiles).absolutePath
-            JsLibraryUtils.copyJsFilesFromLibraries(
-                libraryFiles, outputLibraryRuntimeDirectory,
-                copySourceMap = module.k2JsCompilerArguments.sourceMap
-            )
-        }
-    }
-
-    private val sourceMapRoots: List<File>
-        get() {
-            // Compiler starts to produce path relative to base dirs in source maps if at least one statement is true:
-            // 1) base dirs are specified;
-            // 2) prefix is specified (i.e. non-empty)
-            // Otherwise compiler produces paths relative to source maps location.
-            // We don't have UI to configure base dirs, but we have UI to configure prefix.
-            // If prefix is not specified (empty) in UI, we want to produce paths relative to source maps location
-            return if (module.k2JsCompilerArguments.sourceMapPrefix.isNullOrBlank()) emptyList()
-            else module.contentRootsList.urls
-                .map { URI.create(it) }
-                .filter { it.scheme == "file" }
-                .map { File(it.path) }
-        }
-
-    val friendBuildTargetsMetaFiles
-        get() = friendBuildTargets.mapNotNull {
-            (it as? KotlinJsModuleBuildTarget)?.outputMetaFile?.absoluteFile?.toString()
-        }
-
-    val outputFile
-        get() = explicitOutputPath?.let { File(it) } ?: implicitOutputFile
-
-    private val explicitOutputPath
-        get() = if (isTests) module.testOutputFilePath else module.productionOutputFilePath
-
-    private val implicitOutputFile: File
-        get() {
-            val suffix = if (isTests) "_test" else ""
-
-            return File(outputDir, module.name + suffix + JS_EXT)
-        }
-
-    private val outputFileBaseName: String
-        get() = outputFile.path.substringBeforeLast(".")
-
-    val outputMetaFile: File
-        get() = File(outputFileBaseName + META_JS_SUFFIX)
-
-    private val libraryFiles: List<String>
-        get() = mutableListOf<String>().also { result ->
-            for (library in allDependencies.libraries) {
-                for (root in library.getRoots(JpsOrderRootType.COMPILED)) {
-                    result.add(JpsPathUtil.urlToPath(root.url))
-                }
-            }
-        }
-
-    private val dependenciesMetaFiles: List<String>
-        get() = mutableListOf<String>().also { result ->
-            allDependencies.processModules { module ->
-                if (isTests) addDependencyMetaFile(module, result, isTests = true)
-
-                // note: production targets should be also added as dependency to test targets
-                addDependencyMetaFile(module, result, isTests = false)
-            }
-        }
-
-    private fun addDependencyMetaFile(
-        module: JpsModule,
-        result: MutableList<String>,
-        isTests: Boolean
-    ) {
-        val dependencyBuildTarget = kotlinContext.targetsBinding[ModuleBuildTarget(module, isTests)]
-
-        if (dependencyBuildTarget != this@KotlinJsModuleBuildTarget &&
-            dependencyBuildTarget is KotlinJsModuleBuildTarget &&
-            dependencyBuildTarget.sources.isNotEmpty()
-        ) {
-            val metaFile = dependencyBuildTarget.outputMetaFile.toPath()
-            if (metaFile.exists()) {
-                result.add(metaFile.absolute().pathString)
-            }
-        }
-    }
-
-    override fun createCacheStorage(paths: BuildDataPaths) =
-        JpsIncrementalJsCache(jpsModuleBuildTarget, paths, kotlinContext.fileToPathConverter)
-
-    override fun updateCaches(
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        jpsIncrementalCache: JpsIncrementalCache,
-        files: List<GeneratedFile>,
-        changesCollector: ChangesCollector,
-        environment: JpsCompilerEnvironment
-    ) {
-        super.updateCaches(dirtyFilesHolder, jpsIncrementalCache, files, changesCollector, environment)
-
-        val incrementalResults = environment.services[IncrementalResultsConsumer::class.java] as IncrementalResultsConsumerImpl
-
-        val jsCache = jpsIncrementalCache as IncrementalJsCache
-        jsCache.header = incrementalResults.headerMetadata
-
-        jsCache.updateSourceToOutputMap(files)
-        jsCache.compareAndUpdate(incrementalResults, changesCollector)
-        jsCache.clearCacheForRemovedClasses(changesCollector)
-    }
-
-    override fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, outputItems: List<GeneratedFile>) {
-        if (isIncrementalCompilationEnabled) {
-            for (output in outputItems) {
-                for (source in output.sourceFiles) {
-                    outputConsumer.registerOutputFile(jpsModuleBuildTarget, File("${source.path.hashCode()}"), listOf(source.path))
-                }
-            }
-        } else {
-            super.registerOutputItems(outputConsumer, outputItems)
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
deleted file mode 100644
index f3555970e8cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+++ /dev/null
@@ -1,400 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.jps.targets
-
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.util.text.StringUtil
-import com.intellij.openapi.vfs.StandardFileSystems
-import com.intellij.util.containers.FileCollectionFactory
-import com.intellij.util.io.URLUtil
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.java.JavaBuilderUtil
-import org.jetbrains.jps.builders.java.dependencyView.Callbacks
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.*
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsSdkDependency
-import org.jetbrains.jps.service.JpsServiceManager
-import org.jetbrains.kotlin.build.GeneratedFile
-import org.jetbrains.kotlin.build.GeneratedJvmClass
-import org.jetbrains.kotlin.build.JvmBuildMetaInfo
-import org.jetbrains.kotlin.build.JvmSourceRoot
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.incremental.*
-import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
-import org.jetbrains.kotlin.incremental.components.InlineConstTracker
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.jps.build.KotlinBuilder
-import org.jetbrains.kotlin.jps.build.KotlinCompileContext
-import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalJvmCache
-import org.jetbrains.kotlin.jps.model.k2JvmCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinCompilerSettings
-import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
-import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
-import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder
-import org.jetbrains.kotlin.modules.TargetId
-import org.jetbrains.kotlin.utils.keysToMap
-import org.jetbrains.org.objectweb.asm.ClassReader
-import java.io.File
-import java.io.IOException
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import kotlin.io.path.exists
-import kotlin.io.path.extension
-import kotlin.io.path.notExists
-
-private const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt"
-
-class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleBuildTarget: ModuleBuildTarget) :
-    KotlinModuleBuildTarget<JvmBuildMetaInfo>(kotlinContext, jpsModuleBuildTarget) {
-
-    override val isIncrementalCompilationEnabled: Boolean
-        get() = IncrementalCompilation.isEnabledForJvm()
-
-    override fun createCacheStorage(paths: BuildDataPaths) =
-        JpsIncrementalJvmCache(jpsModuleBuildTarget, paths, kotlinContext.fileToPathConverter)
-
-    override val buildMetaInfoFactory
-        get() = JvmBuildMetaInfo
-
-    override val buildMetaInfoFileName
-        get() = JVM_BUILD_META_INFO_FILE_NAME
-
-    override val targetId: TargetId
-        get() {
-            val moduleName = module.k2JvmCompilerArguments.moduleName
-            return if (moduleName != null) TargetId(moduleName, jpsModuleBuildTarget.targetType.typeId)
-            else super.targetId
-        }
-
-    override fun makeServices(
-        builder: Services.Builder,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        lookupTracker: LookupTracker,
-        exceptActualTracer: ExpectActualTracker,
-        inlineConstTracker: InlineConstTracker
-    ) {
-        super.makeServices(builder, incrementalCaches, lookupTracker, exceptActualTracer, inlineConstTracker)
-
-        with(builder) {
-            register(
-                IncrementalCompilationComponents::class.java,
-                @Suppress("UNCHECKED_CAST")
-                IncrementalCompilationComponentsImpl(
-                    incrementalCaches.mapKeys { it.key.targetId } as Map<TargetId, IncrementalCache>
-                )
-            )
-        }
-    }
-
-    override fun compileModuleChunk(
-        commonArguments: CommonCompilerArguments,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        environment: JpsCompilerEnvironment
-    ): Boolean {
-        require(chunk.representativeTarget == this)
-
-        if (chunk.targets.size > 1) {
-            environment.messageCollector.report(
-                CompilerMessageSeverity.STRONG_WARNING,
-                "Circular dependencies are only partially supported. " +
-                        "The following modules depend on each other: ${chunk.presentableShortName}. " +
-                        "Kotlin will compile them, but some strange effect may happen"
-            )
-        }
-
-        val filesSet = dirtyFilesHolder.allDirtyFiles
-
-        val moduleFile = generateChunkModuleDescription(dirtyFilesHolder)
-        if (moduleFile == null) {
-            if (KotlinBuilder.LOG.isDebugEnabled) {
-                KotlinBuilder.LOG.debug(
-                    "Not compiling, because no files affected: " + chunk.presentableShortName
-                )
-            }
-
-            // No Kotlin sources found
-            return false
-        }
-
-        val module = chunk.representativeTarget.module
-
-        if (KotlinBuilder.LOG.isDebugEnabled) {
-            val totalRemovedFiles = dirtyFilesHolder.allRemovedFilesFiles.size
-            KotlinBuilder.LOG.debug(
-                "Compiling to JVM ${filesSet.size} files"
-                        + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)")
-                        + " in " + chunk.presentableShortName
-            )
-        }
-
-        try {
-            val compilerRunner = JpsKotlinCompilerRunner()
-            compilerRunner.runK2JvmCompiler(
-                commonArguments,
-                module.k2JvmCompilerArguments,
-                module.kotlinCompilerSettings,
-                environment,
-                moduleFile
-            )
-        } finally {
-            if (System.getProperty(DELETE_MODULE_FILE_PROPERTY) != "false") {
-                moduleFile.delete()
-            }
-        }
-
-        return true
-    }
-
-    override fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, outputItems: List<GeneratedFile>) {
-        if (kotlinContext.isInstrumentationEnabled) {
-            val (classFiles, nonClassFiles) = outputItems.partition { it is GeneratedJvmClass }
-            super.registerOutputItems(outputConsumer, nonClassFiles)
-
-            for (output in classFiles) {
-                val bytes = output.outputFile.readBytes()
-                val binaryContent = BinaryContent(bytes)
-                val compiledClass = CompiledClass(output.outputFile, output.sourceFiles, ClassReader(bytes).className, binaryContent)
-                outputConsumer.registerCompiledClass(jpsModuleBuildTarget, compiledClass)
-            }
-        } else {
-            super.registerOutputItems(outputConsumer, outputItems)
-        }
-    }
-
-    private fun generateChunkModuleDescription(dirtyFilesHolder: KotlinDirtySourceFilesHolder): File? {
-        val builder = KotlinModuleXmlBuilder()
-
-        var hasDirtySources = false
-
-        val targets = chunk.targets
-
-        val outputDirs = targets.map { it.outputDir }.toSet()
-
-        for (target in targets) {
-            target as KotlinJvmModuleBuildTarget
-
-            val outputDir = target.outputDir
-            val friendDirs = target.friendOutputDirs
-
-            val sources = target.collectSourcesToCompile(dirtyFilesHolder)
-
-            if (sources.logFiles()) {
-                hasDirtySources = true
-            }
-
-            val kotlinModuleId = target.targetId
-            val allFiles = sources.allFiles
-            val commonSourceFiles = sources.crossCompiledFiles
-
-            builder.addModule(
-                kotlinModuleId.name,
-                outputDir.absolutePath,
-                preprocessSources(allFiles),
-                target.findSourceRoots(dirtyFilesHolder.context),
-                target.findClassPathRoots(),
-                preprocessSources(commonSourceFiles),
-                target.findModularJdkRoot(),
-                kotlinModuleId.type,
-                isTests,
-                // this excludes the output directories from the class path, to be removed for true incremental compilation
-                outputDirs,
-                friendDirs
-            )
-        }
-
-        if (!hasDirtySources) return null
-
-        val scriptFile = createTempFileForChunkModuleDesc()
-        FileUtil.writeToFile(scriptFile, builder.asText().toString())
-        return scriptFile
-    }
-
-    /**
-     * Internal API for source level code preprocessors.
-     *
-     * Currently used in https://plugins.jetbrains.com/plugin/13355-spot-profiler-for-java
-     */
-    interface SourcesPreprocessor {
-        /**
-         * Preprocess some sources and return path to the resulting file.
-         * This function should be pure and should return the same output for given input
-         * (required for incremental compilation).
-         */
-        fun preprocessSources(srcFiles: List<File>): List<File>
-    }
-
-    fun preprocessSources(srcFiles: List<File>): List<File> {
-        var result = srcFiles
-        JpsServiceManager.getInstance().getExtensions(SourcesPreprocessor::class.java).forEach {
-            result = it.preprocessSources(result)
-        }
-        return result
-    }
-
-    private fun createTempFileForChunkModuleDesc(): File {
-        val readableSuffix = buildString {
-            append(StringUtil.sanitizeJavaIdentifier(chunk.representativeTarget.module.name))
-            if (chunk.containsTests) {
-                append("-test")
-            }
-        }
-
-        fun createTempFile(dir: Path?, prefix: String?, suffix: String?): Path =
-            if (dir != null) Files.createTempFile(dir, prefix, suffix) else Files.createTempFile(prefix, suffix)
-
-        val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { Paths.get(it) }?.takeIf { Files.isDirectory(it) }
-        return try {
-            createTempFile(dir, "kjps", readableSuffix + ".script.xml")
-        } catch (e: IOException) {
-            // sometimes files cannot be created, because file name is too long (Windows, Mac OS)
-            // see https://bugs.openjdk.java.net/browse/JDK-8148023
-            try {
-                createTempFile(dir, "kjps", ".script.xml")
-            } catch (e: IOException) {
-                val message = buildString {
-                    append("Could not create module file when building chunk $chunk")
-                    if (dir != null) {
-                        append(" in dir $dir")
-                    }
-                }
-                throw RuntimeException(message, e)
-            }
-        }.toFile()
-    }
-
-    private fun findClassPathRoots(): Collection<File> = allDependencies.classes().roots.filter { file ->
-        val path = file.toPath()
-        if (path.notExists()) {
-            val extension = path.extension
-
-            // Don't filter out files, we want to report warnings about absence through the common place
-            if (extension != "class" && extension != "jar") {
-                return@filter false
-            }
-        }
-
-        true
-    }
-
-    private fun findModularJdkRoot(): File? {
-        // List of paths to JRE modules in the following format:
-        // jrt:///Library/Java/JavaVirtualMachines/jdk-9.jdk/Contents/Home!/java.base
-        val urls = JpsJavaExtensionService.dependencies(module)
-            .satisfying { dependency -> dependency is JpsSdkDependency }
-            .classes().urls
-
-        val url = urls.firstOrNull { it.startsWith(StandardFileSystems.JRT_PROTOCOL_PREFIX) } ?: return null
-
-        return File(url.substringAfter(StandardFileSystems.JRT_PROTOCOL_PREFIX).substringBeforeLast(URLUtil.JAR_SEPARATOR))
-    }
-
-    private fun findSourceRoots(context: CompileContext): List<JvmSourceRoot> {
-        val roots = context.projectDescriptor.buildRootIndex.getTargetRoots(jpsModuleBuildTarget, context)
-        val result = mutableListOf<JvmSourceRoot>()
-        for (root in roots) {
-            val file = root.rootFile
-            val prefix = root.packagePrefix
-            if (file.toPath().exists()) {
-                result.add(JvmSourceRoot(file, prefix.ifEmpty { null }))
-            }
-        }
-        return result
-    }
-
-    override fun updateCaches(
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        jpsIncrementalCache: JpsIncrementalCache,
-        files: List<GeneratedFile>,
-        changesCollector: ChangesCollector,
-        environment: JpsCompilerEnvironment
-    ) {
-        super.updateCaches(dirtyFilesHolder, jpsIncrementalCache, files, changesCollector, environment)
-
-        updateIncrementalCache(files, jpsIncrementalCache as IncrementalJvmCache, changesCollector, null)
-    }
-
-    override val globalLookupCacheId: String
-        get() = "jvm"
-
-    override fun updateChunkMappings(
-        localContext: CompileContext,
-        chunk: ModuleChunk,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        outputItems: Map<ModuleBuildTarget, Iterable<GeneratedFile>>,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        environment: JpsCompilerEnvironment
-    ) {
-        val previousMappings = localContext.projectDescriptor.dataManager.mappings
-        val callback = JavaBuilderUtil.getDependenciesRegistrar(localContext)
-        val inlineConstTracker = environment.services[InlineConstTracker::class.java] as InlineConstTrackerImpl
-
-        val targetDirtyFiles: Map<ModuleBuildTarget, Set<File>> = chunk.targets.keysToMap {
-            val files = HashSet<File>()
-            files.addAll(dirtyFilesHolder.getRemovedFiles(it))
-            files.addAll(dirtyFilesHolder.getDirtyFiles(it).keys)
-            files
-        }
-
-        fun getOldSourceFiles(target: ModuleBuildTarget, generatedClass: GeneratedJvmClass): Set<File> {
-            val cache = incrementalCaches[kotlinContext.targetsBinding[target]] ?: return emptySet()
-            cache as JpsIncrementalJvmCache
-
-            val className = generatedClass.outputClass.className
-            if (!cache.isMultifileFacade(className)) return emptySet()
-
-            val name = previousMappings.getName(className.internalName)
-            return previousMappings.getClassSources(name)?.toSet() ?: emptySet()
-        }
-
-        for ((target, outputs) in outputItems) {
-            for (output in outputs) {
-                if (output !is GeneratedJvmClass) continue
-
-                val sourceFiles = FileCollectionFactory.createCanonicalFileSet()
-                sourceFiles.addAll(getOldSourceFiles(target, output))
-                sourceFiles.removeAll(targetDirtyFiles[target] ?: emptySet())
-                sourceFiles.addAll(output.sourceFiles)
-
-                // process inlineConstTracker
-                for (sourceFile: File in sourceFiles) {
-                    val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.mapNotNull { cRef: ConstantRef ->
-                        val descriptor = when (cRef.constType) {
-                            "Byte" -> "B"
-                            "Short" -> "S"
-                            "Int" -> "I"
-                            "Long" -> "J"
-                            "Float" -> "F"
-                            "Double" -> "D"
-                            "Boolean" -> "Z"
-                            "Char" -> "C"
-                            "String" -> "Ljava/lang/String;"
-                            else -> null
-                        } ?: return@mapNotNull null
-                        Callbacks.createConstantReference(cRef.owner, cRef.name, descriptor)
-                    } ?: continue
-
-                    val className = output.outputClass.className.internalName
-                    callback.registerConstantReferences(className, cRefs)
-                }
-
-                callback.associate(
-                    FileUtil.toSystemIndependentName(output.outputFile.canonicalPath),
-                    sourceFiles.map { FileUtil.toSystemIndependentName(it.canonicalPath) },
-                    ClassReader(output.outputClass.fileContents)
-                )
-            }
-        }
-
-        val allCompiled = dirtyFilesHolder.allDirtyFiles
-        JavaBuilderUtil.registerFilesToCompile(localContext, allCompiled)
-        JavaBuilderUtil.registerSuccessfullyCompiled(localContext, allCompiled)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
deleted file mode 100644
index 905eabf285a9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.targets
-
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.jps.incremental.ProjectBuildException
-import org.jetbrains.jps.model.java.JpsJavaClasspathKind
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.build.BuildMetaInfo
-import org.jetbrains.kotlin.build.BuildMetaInfoFactory
-import org.jetbrains.kotlin.build.GeneratedFile
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
-import org.jetbrains.kotlin.config.ApiVersion
-import org.jetbrains.kotlin.config.LanguageVersion
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.incremental.ChangesCollector
-import org.jetbrains.kotlin.incremental.ExpectActualTrackerImpl
-import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
-import org.jetbrains.kotlin.incremental.components.InlineConstTracker
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.jps.KotlinJpsBundle
-import org.jetbrains.kotlin.jps.build.*
-import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.incremental.loadDiff
-import org.jetbrains.kotlin.jps.incremental.localCacheVersionManager
-import org.jetbrains.kotlin.jps.model.productionOutputFilePath
-import org.jetbrains.kotlin.jps.model.testOutputFilePath
-import org.jetbrains.kotlin.modules.TargetId
-import org.jetbrains.kotlin.progress.CompilationCanceledException
-import org.jetbrains.kotlin.progress.CompilationCanceledStatus
-import org.jetbrains.kotlin.utils.addIfNotNull
-import java.io.File
-import kotlin.io.path.notExists
-import kotlin.io.path.readText
-
-/**
- * Properties and actions for Kotlin test / production module build target.
- */
-abstract class KotlinModuleBuildTarget<BuildMetaInfoType : BuildMetaInfo> internal constructor(
-    val kotlinContext: KotlinCompileContext,
-    val jpsModuleBuildTarget: ModuleBuildTarget
-) {
-    /**
-     * Note: beware of using this context for getting compilation round dependent data:
-     * for example groovy can provide temp source roots with stubs, and it will be visible
-     * only in round local compile context.
-     *
-     * TODO(1.2.80): got rid of jpsGlobalContext and replace it with kotlinContext
-     */
-    val jpsGlobalContext: CompileContext
-        get() = kotlinContext.jpsContext
-
-    // Initialized in KotlinCompileContext.loadTargets
-    lateinit var chunk: KotlinChunk
-
-    abstract val globalLookupCacheId: String
-
-    abstract val isIncrementalCompilationEnabled: Boolean
-
-    open fun isEnabled(chunkCompilerArguments: CommonCompilerArguments): Boolean = true
-
-    @Suppress("LeakingThis")
-    val localCacheVersionManager = localCacheVersionManager(
-        kotlinContext.dataPaths.getTargetDataRoot(jpsModuleBuildTarget).toPath(),
-        isIncrementalCompilationEnabled
-    )
-
-    val initialLocalCacheAttributesDiff: CacheAttributesDiff<*> = localCacheVersionManager.loadDiff()
-
-    val module: JpsModule
-        get() = jpsModuleBuildTarget.module
-
-    val isTests: Boolean
-        get() = jpsModuleBuildTarget.isTests
-
-    open val targetId: TargetId
-        get() {
-            // Since IDEA 2016 each gradle source root is imported as a separate module.
-            // One gradle module X is imported as two JPS modules:
-            // 1. X-production with one production target;
-            // 2. X-test with one test target.
-            // This breaks kotlin code since internal members' names are mangled using module name.
-            // For example, a declaration of a function 'f' in 'X-production' becomes 'fXProduction', but a call 'f' in 'X-test' becomes 'fXTest()'.
-            // The workaround is to replace a name of such test target with the name of corresponding production module.
-            // See KT-11993.
-            val name = relatedProductionModule?.name ?: jpsModuleBuildTarget.id
-            return TargetId(name, jpsModuleBuildTarget.targetType.typeId)
-        }
-
-    val outputDir by lazy {
-        val explicitOutputPath = if (isTests) module.testOutputFilePath else module.productionOutputFilePath
-        val explicitOutputDir = explicitOutputPath?.let { File(it).absoluteFile.parentFile }
-        return@lazy explicitOutputDir
-            ?: jpsModuleBuildTarget.outputDir
-            ?: throw ProjectBuildException(KotlinJpsBundle.message("error.message.no.output.directory.found.for.0", this))
-    }
-
-    val friendBuildTargets: List<KotlinModuleBuildTarget<*>>
-        get() {
-            val result = mutableListOf<KotlinModuleBuildTarget<*>>()
-
-            if (isTests) {
-                result.addIfNotNull(kotlinContext.targetsBinding[module.productionBuildTarget])
-                result.addIfNotNull(kotlinContext.targetsBinding[relatedProductionModule?.productionBuildTarget])
-            }
-
-            return result.filter { it.sources.isNotEmpty() }
-        }
-
-    val friendOutputDirs: List<File>
-        get() = friendBuildTargets.mapNotNull {
-            JpsJavaExtensionService.getInstance().getOutputDirectory(it.module, false)
-        }
-
-    private val relatedProductionModule: JpsModule?
-        get() = JpsJavaExtensionService.getInstance().getTestModuleProperties(module)?.productionModule
-
-    data class Dependency(
-        val src: KotlinModuleBuildTarget<*>,
-        val target: KotlinModuleBuildTarget<*>,
-        val exported: Boolean
-    )
-
-    // TODO(1.2.80): try replace allDependencies with KotlinChunk.collectDependentChunksRecursivelyExportedOnly
-    @Deprecated("Consider using precalculated KotlinChunk.collectDependentChunksRecursivelyExportedOnly")
-    val allDependencies by lazy {
-        JpsJavaExtensionService.dependencies(module).recursively().exportedOnly()
-            .includedIn(JpsJavaClasspathKind.compile(isTests))
-    }
-
-    /**
-     * All sources of this target (including non dirty).
-     *
-     * Lazy initialization is required since value is required only in rare cases.
-     *
-     * Before first round initialized lazily based on global context.
-     * This is required for friend build targets, when friends are not compiled in this build run.
-     *
-     * Lazy value will be invalidated on each round (should be recalculated based on round local context).
-     * Update required since source roots can be changed, for example groovy can provide new temporary source roots with stubs.
-     *
-     * Ugly delegation to lazy is used to capture local compile context and reset calculated value.
-     */
-    val sources: Map<File, Source>
-        get() = _sources.value
-
-    @Volatile
-    private var _sources: Lazy<Map<File, Source>> = lazy { computeSourcesList(jpsGlobalContext) }
-
-    fun nextRound(localContext: CompileContext) {
-        _sources = lazy { computeSourcesList(localContext) }
-    }
-
-    private fun computeSourcesList(localContext: CompileContext): Map<File, Source> {
-        val result = mutableMapOf<File, Source>()
-        val moduleExcludes = module.excludeRootsList.urls.mapTo(java.util.HashSet(), JpsPathUtil::urlToFile)
-
-        val compilerExcludes = JpsJavaExtensionService.getInstance()
-            .getOrCreateCompilerConfiguration(module.project)
-            .compilerExcludes
-
-        val buildRootIndex = localContext.projectDescriptor.buildRootIndex
-        val roots = buildRootIndex.getTargetRoots(jpsModuleBuildTarget, localContext)
-        roots.forEach { rootDescriptor ->
-            val isCrossCompiled = rootDescriptor is KotlinIncludedModuleSourceRoot
-
-            rootDescriptor.root.walkTopDown()
-                .onEnter { file -> file !in moduleExcludes }
-                .forEach { file ->
-                    if (!compilerExcludes.isExcluded(file) && file.isFile && file.isKotlinSourceFile) {
-                        result[file] = Source(file, isCrossCompiled)
-                    }
-                }
-
-        }
-
-        return result
-    }
-
-    /**
-     * @property isCrossCompiled sources that are cross-compiled to multiple targets
-     */
-    class Source(
-        val file: File,
-        val isCrossCompiled: Boolean
-    )
-
-    fun isFromIncludedSourceRoot(file: File): Boolean = sources[file]?.isCrossCompiled == true
-
-    val sourceFiles: Collection<File>
-        get() = sources.keys
-
-    override fun toString() = jpsModuleBuildTarget.toString()
-
-    /**
-     * Called for `ModuleChunk.representativeTarget`
-     */
-    abstract fun compileModuleChunk(
-        commonArguments: CommonCompilerArguments,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        environment: JpsCompilerEnvironment
-    ): Boolean
-
-    open fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, outputItems: List<GeneratedFile>) {
-        for (output in outputItems) {
-            outputConsumer.registerOutputFile(jpsModuleBuildTarget, output.outputFile, output.sourceFiles.map { it.path })
-        }
-    }
-
-    protected fun reportAndSkipCircular(environment: JpsCompilerEnvironment): Boolean {
-        if (chunk.targets.size > 1) {
-            // We do not support circular dependencies, but if they are present, we do our best should not break the build,
-            // so we simply yield a warning and report NOTHING_DONE
-            environment.messageCollector.report(
-                CompilerMessageSeverity.STRONG_WARNING,
-                "Circular dependencies are not supported. The following modules depend on each other: "
-                        + chunk.presentableShortName + " "
-                        + "Kotlin is not compiled for these modules"
-            )
-
-            return true
-        }
-
-        return false
-    }
-
-    open fun doAfterBuild() {
-    }
-
-    open val hasCaches: Boolean = true
-
-    abstract fun createCacheStorage(paths: BuildDataPaths): JpsIncrementalCache
-
-    /**
-     * Called for `ModuleChunk.representativeTarget`
-     */
-    open fun updateChunkMappings(
-        localContext: CompileContext,
-        chunk: ModuleChunk,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        outputItems: Map<ModuleBuildTarget, Iterable<GeneratedFile>>,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        environment: JpsCompilerEnvironment
-    ) {
-        // by default do nothing
-    }
-
-    open fun updateCaches(
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        jpsIncrementalCache: JpsIncrementalCache,
-        files: List<GeneratedFile>,
-        changesCollector: ChangesCollector,
-        environment: JpsCompilerEnvironment
-    ) {
-        val changedAndRemovedFiles = dirtyFilesHolder.getDirtyFiles(jpsModuleBuildTarget).keys +
-                dirtyFilesHolder.getRemovedFiles(jpsModuleBuildTarget)
-        val expectActualTracker = environment.services[ExpectActualTracker::class.java] as ExpectActualTrackerImpl
-
-        jpsIncrementalCache.updateComplementaryFiles(changedAndRemovedFiles, expectActualTracker)
-    }
-
-    open fun makeServices(
-        builder: Services.Builder,
-        incrementalCaches: Map<KotlinModuleBuildTarget<*>, JpsIncrementalCache>,
-        lookupTracker: LookupTracker,
-        exceptActualTracer: ExpectActualTracker,
-        inlineConstTracker: InlineConstTracker
-    ) {
-        with(builder) {
-            register(LookupTracker::class.java, lookupTracker)
-            register(ExpectActualTracker::class.java, exceptActualTracer)
-            register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus {
-                override fun checkCanceled() {
-                    if (jpsGlobalContext.cancelStatus.isCanceled) throw CompilationCanceledException()
-                }
-            })
-            register(InlineConstTracker::class.java, inlineConstTracker)
-        }
-    }
-
-    /**
-     * Should be used only for particular target in chunk (jvm)
-     *
-     * Should not be cached since may be vary in different rounds.
-     */
-    protected fun collectSourcesToCompile(
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder
-    ) = SourcesToCompile(
-        sources = when {
-            chunk.representativeTarget.isIncrementalCompilationEnabled ->
-                dirtyFilesHolder.getDirtyFiles(jpsModuleBuildTarget).values
-            else -> sources.values
-        },
-        removedFiles = dirtyFilesHolder.getRemovedFiles(jpsModuleBuildTarget)
-    )
-
-    inner class SourcesToCompile(
-        sources: Collection<KotlinModuleBuildTarget.Source>,
-        val removedFiles: Collection<File>
-    ) {
-        val allFiles = sources.map { it.file }
-        val crossCompiledFiles = sources.filter { it.isCrossCompiled }.map { it.file }
-
-        /**
-         * @return true, if there are removed files or files to compile
-         */
-        fun logFiles(): Boolean {
-            val hasRemovedSources = removedFiles.isNotEmpty()
-            val hasDirtyOrRemovedSources = allFiles.isNotEmpty() || hasRemovedSources
-
-            if (hasDirtyOrRemovedSources) {
-                val logger = jpsGlobalContext.loggingManager.projectBuilderLogger
-                if (logger.isEnabled) {
-                    logger.logCompiledFiles(allFiles, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:")
-                }
-            }
-
-            return hasDirtyOrRemovedSources
-        }
-    }
-
-    abstract val buildMetaInfoFactory: BuildMetaInfoFactory<BuildMetaInfoType>
-
-    abstract val buildMetaInfoFileName: String
-
-    fun isVersionChanged(chunk: KotlinChunk, buildMetaInfo: BuildMetaInfo): Boolean {
-        val file = chunk.buildMetaInfoFile(jpsModuleBuildTarget)
-        if (file.notExists()) return false
-
-        val prevBuildMetaInfo =
-            try {
-                buildMetaInfoFactory.deserializeFromString(file.readText()) ?: return false
-            } catch (e: Exception) {
-                KotlinBuilder.LOG.error("Could not deserialize build meta info", e)
-                return false
-            }
-
-        val prevLangVersion = LanguageVersion.fromVersionString(prevBuildMetaInfo.languageVersionString)
-        val prevApiVersion = ApiVersion.parse(prevBuildMetaInfo.apiVersionString)
-
-        val reasonToRebuild = when {
-            chunk.langVersion != prevLangVersion -> "Language version was changed ($prevLangVersion -> ${chunk.langVersion})"
-            chunk.apiVersion != prevApiVersion -> "Api version was changed ($prevApiVersion -> ${chunk.apiVersion})"
-            prevLangVersion != LanguageVersion.KOTLIN_1_0 && prevBuildMetaInfo.isEAP && !buildMetaInfo.isEAP -> {
-                // If EAP->Non-EAP build with IC, then rebuild all kotlin
-                "Last build was compiled with EAP-plugin"
-            }
-            else -> null
-        }
-
-        if (reasonToRebuild != null) {
-            KotlinBuilder.LOG.info("$reasonToRebuild. Performing non-incremental rebuild (kotlin only)")
-            return true
-        }
-
-        return false
-    }
-
-    private fun checkRepresentativeTarget(chunk: KotlinChunk) {
-        check(chunk.representativeTarget == this)
-    }
-
-    private fun checkRepresentativeTarget(chunk: ModuleChunk) {
-        check(chunk.representativeTarget() == jpsModuleBuildTarget)
-    }
-
-    private fun checkRepresentativeTarget(chunk: List<KotlinModuleBuildTarget<*>>) {
-        check(chunk.first() == this)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinTargetsIndex.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinTargetsIndex.kt
deleted file mode 100644
index e367bd97d178..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinTargetsIndex.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.targets
-
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.jps.model.java.JpsJavaClasspathKind
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.kotlin.jps.build.KotlinBuilder
-import org.jetbrains.kotlin.jps.build.KotlinChunk
-import org.jetbrains.kotlin.jps.build.KotlinCompileContext
-import org.jetbrains.kotlin.jps.build.ModuleBuildTarget
-import org.jetbrains.kotlin.jps.model.platform
-import org.jetbrains.kotlin.platform.DefaultIdeTargetPlatformKindProvider
-import org.jetbrains.kotlin.platform.idePlatformKind
-import org.jetbrains.kotlin.platform.impl.*
-import kotlin.system.measureTimeMillis
-
-class KotlinTargetsIndex(
-    val byJpsTarget: Map<ModuleBuildTarget, KotlinModuleBuildTarget<*>>,
-    val chunks: List<KotlinChunk>,
-    val chunksByJpsRepresentativeTarget: Map<ModuleBuildTarget, KotlinChunk>
-)
-
-internal class KotlinTargetsIndexBuilder internal constructor(
-    private val uninitializedContext: KotlinCompileContext
-) {
-    private val byJpsModuleBuildTarget = mutableMapOf<ModuleBuildTarget, KotlinModuleBuildTarget<*>>()
-    private val chunks = mutableListOf<KotlinChunk>()
-
-    fun build(): KotlinTargetsIndex {
-        val time = measureTimeMillis {
-            val jpsContext = uninitializedContext.jpsContext
-
-            // visit all kotlin build targets
-            jpsContext.projectDescriptor.buildTargetIndex.getSortedTargetChunks(jpsContext).forEach { chunk ->
-                val moduleBuildTargets = chunk.targets.mapNotNull {
-                    if (it is ModuleBuildTarget) ensureLoaded(it)
-                    else null
-                }
-
-                if (moduleBuildTargets.isNotEmpty()) {
-                    val kotlinChunk = KotlinChunk(uninitializedContext, moduleBuildTargets)
-                    moduleBuildTargets.forEach {
-                        it.chunk = kotlinChunk
-                    }
-
-                    chunks.add(kotlinChunk)
-                }
-            }
-
-            calculateChunkDependencies()
-        }
-
-        KotlinBuilder.LOG.info("KotlinTargetsIndex created in $time ms")
-
-        return KotlinTargetsIndex(
-            byJpsModuleBuildTarget,
-            chunks,
-            chunks.associateBy { it.representativeTarget.jpsModuleBuildTarget }
-        )
-    }
-
-    private fun calculateChunkDependencies() {
-        chunks.forEach { chunk ->
-            val dependencies = mutableSetOf<KotlinModuleBuildTarget.Dependency>()
-
-            chunk.targets.forEach {
-                dependencies.addAll(calculateTargetDependencies(it))
-            }
-
-            chunk.dependencies = dependencies.toList()
-            chunk.dependencies.forEach { dependency ->
-                dependency.target.chunk._dependent!!.add(dependency)
-            }
-        }
-
-        chunks.forEach {
-            it.dependent = it._dependent!!.toList()
-            it._dependent = null
-        }
-    }
-
-    private fun calculateTargetDependencies(srcTarget: KotlinModuleBuildTarget<*>): List<KotlinModuleBuildTarget.Dependency> {
-        val dependencies = mutableListOf<KotlinModuleBuildTarget.Dependency>()
-        val classpathKind = JpsJavaClasspathKind.compile(srcTarget.isTests)
-
-        // TODO(1.2.80): Ask for JPS API
-        // Unfortunately JPS has no API for accessing "exported" flag while enumerating module dependencies,
-        // but has API for getting all and exported only dependent modules.
-        // So, lets first get set of all dependent targets, then remove exported only.
-        val dependentTargets = mutableSetOf<KotlinModuleBuildTarget<*>>()
-
-        JpsJavaExtensionService.dependencies(srcTarget.module)
-            .includedIn(classpathKind)
-            .processModules { destModule ->
-                val destKotlinTarget = byJpsModuleBuildTarget[ModuleBuildTarget(destModule, srcTarget.isTests)]
-                if (destKotlinTarget != null) {
-                    dependentTargets.add(destKotlinTarget)
-                }
-            }
-
-        JpsJavaExtensionService.dependencies(srcTarget.module)
-            .includedIn(classpathKind)
-            .exportedOnly()
-            .processModules { module ->
-                val destKotlinTarget = byJpsModuleBuildTarget[ModuleBuildTarget(module, srcTarget.isTests)]
-                if (destKotlinTarget != null) {
-                    dependentTargets.remove(destKotlinTarget)
-                    dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, destKotlinTarget, true))
-                }
-            }
-
-        dependentTargets.forEach { destTarget ->
-            dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, destTarget, false))
-        }
-
-        if (srcTarget.isTests) {
-            val srcProductionTarget = byJpsModuleBuildTarget[ModuleBuildTarget(srcTarget.module, false)]
-            if (srcProductionTarget != null) {
-                dependencies.add(KotlinModuleBuildTarget.Dependency(srcTarget, srcProductionTarget, true))
-            }
-        }
-
-        return dependencies
-    }
-
-    private fun ensureLoaded(target: ModuleBuildTarget): KotlinModuleBuildTarget<*> {
-        return byJpsModuleBuildTarget.computeIfAbsent(target) {
-            val platform = target.module.platform?.idePlatformKind ?: DefaultIdeTargetPlatformKindProvider.defaultPlatform.idePlatformKind
-
-            when {
-                platform.isCommon -> KotlinCommonModuleBuildTarget(uninitializedContext, target)
-                platform.isJavaScript -> KotlinJsModuleBuildTarget(uninitializedContext, target)
-                platform.isJvm -> KotlinJvmModuleBuildTarget(uninitializedContext, target)
-                else -> KotlinUnsupportedModuleBuildTarget(uninitializedContext, target)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinUnsupportedModuleBuildTarget.kt b/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinUnsupportedModuleBuildTarget.kt
deleted file mode 100644
index 24790d862071..000000000000
--- a/plugins/kotlin/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinUnsupportedModuleBuildTarget.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.targets
-
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.kotlin.build.BuildMetaInfo
-import org.jetbrains.kotlin.build.BuildMetaInfoFactory
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment
-import org.jetbrains.kotlin.jps.build.KotlinCompileContext
-import org.jetbrains.kotlin.jps.build.KotlinDirtySourceFilesHolder
-import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
-import org.jetbrains.kotlin.jps.model.platform
-import org.jetbrains.kotlin.platform.idePlatformKind
-
-class KotlinUnsupportedModuleBuildTarget(
-    kotlinContext: KotlinCompileContext,
-    jpsModuleBuildTarget: ModuleBuildTarget
-) : KotlinModuleBuildTarget<BuildMetaInfo>(kotlinContext, jpsModuleBuildTarget) {
-    val kind = module.platform?.idePlatformKind?.name
-
-    private fun shouldNotBeCalled(): Nothing = error("Should not be called")
-
-    override fun isEnabled(chunkCompilerArguments: CommonCompilerArguments): Boolean {
-        return false
-    }
-
-    override val isIncrementalCompilationEnabled: Boolean
-        get() = false
-
-    override val hasCaches: Boolean
-        get() = false
-
-    override val globalLookupCacheId: String
-        get() = shouldNotBeCalled()
-
-    override fun compileModuleChunk(
-        commonArguments: CommonCompilerArguments,
-        dirtyFilesHolder: KotlinDirtySourceFilesHolder,
-        environment: JpsCompilerEnvironment
-    ): Boolean {
-        shouldNotBeCalled()
-    }
-
-    override fun createCacheStorage(paths: BuildDataPaths): JpsIncrementalCache {
-        shouldNotBeCalled()
-    }
-
-    override val buildMetaInfoFactory: BuildMetaInfoFactory<BuildMetaInfo>
-        get() = shouldNotBeCalled()
-
-    override val buildMetaInfoFileName: String
-        get() = shouldNotBeCalled()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log
deleted file mode 100644
index fcdbd8263440..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/fir-build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: A.Companion
-Unresolved reference: x
-Unresolved reference: Companion
-Unresolved reference: x
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log
deleted file mode 100644
index 476f0317c030..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/fir-build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/notUsage.kt
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: Nested
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
deleted file mode 100644
index d9b0d1123e4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/const.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is kotlin/Int but kotlin/Byte was expected
-Type mismatch: inferred type is kotlin/Int but kotlin/Short was expected
-
-================ Step #2 =================
-
-Compiling files:
-  src/const.kt
-  src/usage.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt
deleted file mode 100644
index 8795a0368bb2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class A {
-    companion object {
-        const val CONSTANT_VALUE = 16
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new
deleted file mode 100644
index 38d550d75547..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/A.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class A {
-    companion object {
-        const val CONSTANT_VALUE = 17
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt
deleted file mode 100644
index 88610dd3c608..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/B.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package foo
-
-import test.A.Companion.CONSTANT_VALUE
-
-class B {
-    companion object {
-        fun main() {
-            println("Import companion constant: ${CONSTANT_VALUE}")
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt
deleted file mode 100644
index 3604aa18750a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/C.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo
-
-import test.A
-
-class C {
-    companion object {
-        fun main() {
-            println("Companion constant: ${A.CONSTANT_VALUE}")
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt
deleted file mode 100644
index e17f38035ca1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/DoNotUseConstant.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-class DoNotUseConstant {
-    companion object {
-        const val CONSTANT_VALUE = 10
-        fun main() {
-            println("Use local constant: ${CONSTANT_VALUE}")
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log
deleted file mode 100644
index f6b36cf7bacf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/build.log
+++ /dev/null
@@ -1,34 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A$Companion.class
-  out/production/module/test/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/C.kt
-  src/companionUsage.kt
-  src/constantUsage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/B$Companion.class
-  out/production/module/foo/B.class
-  out/production/module/foo/C$Companion.class
-  out/production/module/foo/C.class
-  out/production/module/foo/CompanionUsageKt.class
-  out/production/module/foo/ConstantUsageKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/companionUsage.kt
-  src/constantUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt
deleted file mode 100644
index 14e319277e07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/companionUsage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-import test.A
-
-fun callCompanionConstant() = "Companion constant: ${A.CONSTANT_VALUE}"
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt
deleted file mode 100644
index d8977a568336..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/pureKotlin/companionConstantChanged/constantUsage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo
-
-import test.A.Companion.CONSTANT_VALUE
-
-fun importCompanionConstant() = "Import companion constant: ${CONSTANT_VALUE}"
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log
deleted file mode 100644
index c3401798a520..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/fir-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/notUsage.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log
deleted file mode 100644
index 1a89b669b016..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/fir-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-  src/notUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log
deleted file mode 100644
index 1a89b669b016..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/fir-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-  src/notUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log
deleted file mode 100644
index ce36458a102a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-fir-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/notUsage.kt
-  src/usage.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log
deleted file mode 100644
index 87c512db88ab..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/fir-build.log
+++ /dev/null
@@ -1,15 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/notUsage.kt
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Symbol /JavaClass.foo is invisible
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log
deleted file mode 100644
index 1a89b669b016..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/fir-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-  src/notUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java
deleted file mode 100644
index d8f3b140d2d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        public class InnerInner {
-            public static final String CONST = "A";
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new
deleted file mode 100644
index 89559cf601b8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        public class InnerInner {
-            public static final String CONST = "B";
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt
deleted file mode 100644
index bc9ffcac4e0e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/KotlinUsageClass.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import JavaClass.Inner.InnerInner.CONST
-
-class KotlinUsageClass {
-    val myKotlinConst = CONST
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log
deleted file mode 100644
index ca8f7d41dae2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass$Inner$InnerInner.class
-  out/production/module/JavaClass$Inner.class
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/KotlinUsageClass.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/KotlinUsageClass.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantPropertyChanged/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/fir-build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log
deleted file mode 100644
index d52f88e46293..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/fir-build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Sub.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'y' hides member of supertype 'Super' and needs 'override' modifier
-
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/fir-build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java
deleted file mode 100644
index 840d39f109a1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    void run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new
deleted file mode 100644
index e770cb0f72b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/SamInterface.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    default void run() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
deleted file mode 100644
index 589017c97e08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/SamInterface.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/SamInterface.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
-  out/production/module/UsageWithFunctionExpressionKt.class
-  out/production/module/UsageWithFunctionLiteralKt.class
-End of files
-Compiling files:
-  src/usageWithFunctionExpression.kt
-  src/usageWithFunctionLiteral.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Interface SamInterface does not have constructors
-Interface SamInterface does not have constructors
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt
deleted file mode 100644
index 816be9e8aca3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionExpression.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun usageWithFunctionExpression() {
-    val a = { println("Hi!") }
-    SamInterface(a)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt
deleted file mode 100644
index 84f2289b91f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddDefault/usageWithFunctionLiteral.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithFunctionLiteral() {
-    SamInterface { println("Hi!") }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log
deleted file mode 100644
index 1e8230c95899..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/gradle-build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/partB.kt
-  src/usagePartB.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: OuterClass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log b/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log
deleted file mode 100644
index d36b2cede112..000000000000
--- a/plugins/kotlin/jps/jps-plugin/testData/incremental/withJava/other/packageFacadeToClass/fir-build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/A__APartFKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Cleaning output files:
-  out/production/module/A__APartGKt.class
-End of files
-Cleaning output files:
-  out/production/module/UseFJava.class
-  out/production/module/UseFKt.class
-  out/production/module/UseGKt.class
-End of files
-Compiling files:
-  src/A.kt
-  src/useAA.kt
-  src/useF.kt
-  src/useG.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: f
-Unresolved reference: g
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/useAA.kt
-  src/useF.kt
-  src/useG.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/UseFJava.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/kotlin.jps-plugin.tests.iml b/plugins/kotlin/jps/jps-plugin/tests/kotlin.jps-plugin.tests.iml
deleted file mode 100644
index 61b1c927fe44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/kotlin.jps-plugin.tests.iml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-reflect" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
-    <orderEntry type="library" name="Log4J" level="project" />
-    <orderEntry type="library" scope="TEST" name="Guava" level="project" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-cli" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-build-common-tests" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinc.incremental-compilation-impl-tests" level="project" />
-    <orderEntry type="module" module-name="kotlin.common" />
-    <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.tests" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.jps.build" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model" />
-    <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
-    <orderEntry type="module" module-name="intellij.devkit.jps" scope="TEST" />
-    <orderEntry type="library" name="fastutil-min" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
-    <orderEntry type="library" scope="TEST" name="ASM" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractDataContainerVersionChangedTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractDataContainerVersionChangedTest.kt
deleted file mode 100644
index e9a3833ae243..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractDataContainerVersionChangedTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-
-/**
- * @see [jps-plugin/tests/testData/incremental/cacheVersionChanged/README.md]
- */
-abstract class AbstractDataContainerVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() {
-    override val buildLogFinder: BuildLogFinder
-        get() = BuildLogFinder(isDataContainerBuildLogEnabled = true)
-
-    override fun getVersionManagersToTest(target: KotlinModuleBuildTarget<*>) =
-        listOf(kotlinCompileContext.lookupsCacheAttributesManager.versionManagerForTesting)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt
deleted file mode 100644
index a278fb84f9ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.incremental.testingUtils.Modification
-import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent
-import org.jetbrains.kotlin.jps.incremental.CacheVersionManager
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-
-/**
- * @see [jps-plugin/tests/testData/incremental/cacheVersionChanged/README.md]
- */
-abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJvmJpsTest(allowNoFilesWithSuffixInTestData = true) {
-    override fun performAdditionalModifications(modifications: List<Modification>) {
-        val modifiedFiles = modifications.filterIsInstance<ModifyContent>().map { it.path }
-        val targets = projectDescriptor.allModuleTargets
-        val hasKotlin = HasKotlinMarker(projectDescriptor.dataManager)
-
-        if (modifiedFiles.any { it.endsWith("clear-has-kotlin") }) {
-            targets.forEach { hasKotlin.clean(it) }
-        }
-
-        if (modifiedFiles.none { it.endsWith("do-not-change-cache-versions") }) {
-            val versions = targets.flatMap {
-                getVersionManagersToTest(kotlinCompileContext.targetsBinding[it]!!)
-            }
-
-            versions.forEach {
-                if (it.versionFileForTesting.exists()) {
-                    it.versionFileForTesting.writeText("777")
-                }
-            }
-        }
-    }
-
-    protected open fun getVersionManagersToTest(target: KotlinModuleBuildTarget<*>): List<CacheVersionManager> =
-        listOf(target.localCacheVersionManager)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
deleted file mode 100644
index 82cf8e6231dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ /dev/null
@@ -1,679 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.Disposable
-import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.util.io.FileUtilRt
-import com.intellij.testFramework.TestLoggerFactory
-import com.intellij.testFramework.UsefulTestCase
-import com.intellij.util.ThrowableRunnable
-import junit.framework.TestCase
-import org.apache.log4j.ConsoleAppender
-import org.apache.log4j.Level
-import org.apache.log4j.Logger
-import org.apache.log4j.PatternLayout
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.api.CanceledStatus
-import org.jetbrains.jps.builders.BuildResult
-import org.jetbrains.jps.builders.CompileScopeTestBuilder
-import org.jetbrains.jps.builders.impl.BuildDataPathsImpl
-import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase
-import org.jetbrains.jps.builders.java.dependencyView.Callbacks
-import org.jetbrains.jps.builders.logging.BuildLoggingManager
-import org.jetbrains.jps.cmdline.ProjectDescriptor
-import org.jetbrains.jps.incremental.*
-import org.jetbrains.jps.incremental.messages.BuildMessage
-import org.jetbrains.jps.model.JpsDummyElement
-import org.jetbrains.jps.model.JpsModuleRootModificationUtil
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.library.sdk.JpsSdk
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
-import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.testingUtils.*
-import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt
-import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxtBuilder
-import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
-import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
-import org.jetbrains.kotlin.jps.incremental.CacheVersionManager
-import org.jetbrains.kotlin.jps.incremental.CompositeLookupsCacheAttributesManager
-import org.jetbrains.kotlin.jps.incremental.getKotlinCache
-import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
-import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinFacet
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.platform.idePlatformKind
-import org.jetbrains.kotlin.platform.impl.isJavaScript
-import org.jetbrains.kotlin.platform.impl.isJvm
-import org.jetbrains.kotlin.platform.orDefault
-import org.jetbrains.kotlin.utils.Printer
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import java.io.File
-import java.io.PrintStream
-import java.util.*
-import kotlin.reflect.jvm.javaField
-
-abstract class AbstractIncrementalJpsTest(
-    private val allowNoFilesWithSuffixInTestData: Boolean = false,
-    private val checkDumpsCaseInsensitively: Boolean = false
-) : BaseKotlinJpsBuildTestCase() {
-    companion object {
-        private val COMPILATION_FAILED = "COMPILATION FAILED"
-
-        // change to "/tmp" or anything when default is too long (for easier debugging)
-        private val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory())
-
-        private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true"
-
-        private const val ARGUMENTS_FILE_NAME = "args.txt"
-
-        private fun parseAdditionalArgs(testDir: File): List<String> {
-            return File(testDir, ARGUMENTS_FILE_NAME)
-                .takeIf { it.exists() }
-                ?.readText()
-                ?.split(" ", "\n")
-                ?.filter { it.isNotBlank() }
-                ?: emptyList()
-        }
-    }
-
-    protected lateinit var testDataDir: File
-    protected lateinit var workDir: File
-    protected lateinit var projectDescriptor: ProjectDescriptor
-    protected lateinit var additionalCommandLineArguments: List<String>
-
-    // is used to compare lookup dumps in a human readable way (lookup symbols are hashed in an actual lookup storage)
-    protected lateinit var lookupsDuringTest: MutableSet<LookupSymbol>
-    private var isJvmICEnabledBackup: Boolean = false
-    private var isJsICEnabledBackup: Boolean = false
-
-    protected var mapWorkingToOriginalFile: MutableMap<File, File> = hashMapOf()
-
-    lateinit var kotlinCompileContext: KotlinCompileContext
-
-    protected open val buildLogFinder: BuildLogFinder
-        get() = BuildLogFinder()
-
-    private fun enableDebugLogging() {
-        com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java)
-        TestLoggerFactory.dumpLogToStdout("")
-        TestLoggerFactory.enableDebugLogging(testRootDisposable, "#org")
-
-        val console = ConsoleAppender()
-        console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n")
-        console.threshold = Level.ALL
-        console.activateOptions()
-        Logger.getRootLogger().addAppender(console)
-    }
-
-    private var systemPropertiesBackup = run {
-        val props = System.getProperties()
-        val output = ByteArrayOutputStream()
-        props.store(output, "System properties backup")
-        output.toByteArray()
-    }
-
-    private fun restoreSystemProperties() {
-        val input = ByteArrayInputStream(systemPropertiesBackup)
-        val props = Properties()
-        props.load(input)
-        System.setProperties(props)
-    }
-
-    private val enableICFixture = EnableICFixture()
-
-    override fun setUp() {
-        super.setUp()
-
-        enableICFixture.setUp()
-        lookupsDuringTest = hashSetOf()
-
-        if (DEBUG_LOGGING_ENABLED) {
-            enableDebugLogging()
-        }
-        System.getProperties()
-            .setProperty("kotlin.jps.classPrefixesToLoadByParent", "kotlin.") // for debugging tests with in-process compiler
-    }
-
-    override fun tearDown() {
-        try {
-            restoreSystemProperties()
-
-            (AbstractIncrementalJpsTest::myProject).javaField!![this] = null
-            (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
-            (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
-        } finally {
-            runAll(
-                ThrowableRunnable { lookupsDuringTest.clear() },
-                ThrowableRunnable { enableICFixture.tearDown() },
-                ThrowableRunnable { super.tearDown() }
-            )
-        }
-    }
-
-    // JPS forces rebuild of all files when JVM constant has been changed and Callbacks.ConstantAffectionResolver
-    // is not provided, so ConstantAffectionResolver is mocked with empty implementation
-    // Usages in Kotlin files are expected to be found by KotlinLookupConstantSearch
-    protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver?
-        get() = MockJavaConstantSearch(workDir)
-
-    private fun build(
-        name: String?,
-        scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().allModules()
-    ): MakeResult {
-        val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath)
-
-        val logger = MyLogger(workDirPath)
-        projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger))
-
-        val lookupTracker = TestLookupTracker()
-        val testingContext = TestingContext(lookupTracker, logger)
-        projectDescriptor.project.setTestingContext(testingContext)
-
-        try {
-            val builder = IncProjectBuilder(
-                projectDescriptor,
-                BuilderRegistry.getInstance(),
-                myBuildParams,
-                CanceledStatus.NULL,
-                true
-            )
-            val buildResult = BuildResult()
-            builder.addMessageHandler(buildResult)
-            val finalScope = scope.build()
-            projectDescriptor.project.kotlinCommonCompilerArguments = projectDescriptor.project.kotlinCommonCompilerArguments.apply {
-                updateCommandLineArguments(this)
-            }
-
-            builder.build(finalScope, false)
-
-            // testingContext.kotlinCompileContext is initialized in KotlinBuilder.initializeKotlinContext
-            kotlinCompileContext = testingContext.kotlinCompileContext!!
-
-            lookupTracker.lookups.mapTo(lookupsDuringTest) { LookupSymbol(it.name, it.scopeFqName) }
-
-            if (!buildResult.isSuccessful) {
-                val errorMessages =
-                    buildResult
-                        .getMessages(BuildMessage.Kind.ERROR)
-                        .map { it.messageText }
-                        .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() }
-                        .joinToString("\n")
-                return MakeResult(
-                    log = logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n",
-                    makeFailed = true,
-                    mappingsDump = null,
-                    name = name
-                )
-            } else {
-                return MakeResult(
-                    log = logger.log,
-                    makeFailed = false,
-                    mappingsDump = createMappingsDump(projectDescriptor, kotlinCompileContext, lookupsDuringTest),
-                    name = name
-                )
-            }
-        } finally {
-            projectDescriptor.dataManager.flush(false)
-            projectDescriptor.release()
-        }
-    }
-
-    private fun initialMake(): MakeResult {
-        val makeResult = build(null)
-
-        val initBuildLogFile = File(testDataDir, "init-build.log")
-        if (initBuildLogFile.exists()) {
-            UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log)
-        } else {
-            assertFalse("Initial make failed:\n$makeResult", makeResult.makeFailed)
-        }
-
-        return makeResult
-    }
-
-    private fun make(name: String?): MakeResult {
-        return build(name)
-    }
-
-    private fun rebuild(): MakeResult {
-        return build(null, CompileScopeTestBuilder.rebuild().allModules())
-    }
-
-    private fun updateCommandLineArguments(arguments: CommonCompilerArguments) {
-        parseCommandLineArguments(additionalCommandLineArguments, arguments)
-    }
-
-    private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) {
-        val outDir = File(getAbsolutePath("out"))
-        val outAfterMake = File(getAbsolutePath("out-after-make"))
-
-        if (outDir.exists()) {
-            FileUtil.copyDir(outDir, outAfterMake)
-        }
-
-        val rebuildResult = rebuild()
-        assertEquals(
-            "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult",
-            rebuildResult.makeFailed, makeOverallResult.makeFailed
-        )
-
-        if (!outAfterMake.exists()) {
-            assertFalse(outDir.exists())
-        } else {
-            assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed)
-        }
-
-        if (!makeOverallResult.makeFailed) {
-            if (checkDumpsCaseInsensitively && rebuildResult.mappingsDump?.toLowerCase() == makeOverallResult.mappingsDump?.toLowerCase()) {
-                // do nothing
-            } else {
-                TestCase.assertEquals(rebuildResult.mappingsDump, makeOverallResult.mappingsDump)
-            }
-        }
-
-        FileUtil.delete(outAfterMake)
-    }
-
-    private fun clearCachesRebuildAndCheckOutput(makeOverallResult: MakeResult) {
-        FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot!!)
-
-        rebuildAndCheckOutput(makeOverallResult)
-    }
-
-    open val modulesTxtFile
-        get() = File(testDataDir, "dependencies.txt")
-
-    private fun readModulesTxt(): ModulesTxt? {
-        var actualModulesTxtFile = modulesTxtFile
-
-        if (!actualModulesTxtFile.exists()) {
-            // also try `"_${fileName}.txt"`. Useful for sorting files in IDE.
-            actualModulesTxtFile = modulesTxtFile.parentFile.resolve("_" + modulesTxtFile.name)
-            if (!actualModulesTxtFile.exists()) return null
-        }
-
-        return ModulesTxtBuilder().readFile(actualModulesTxtFile)
-    }
-
-    protected open fun createBuildLog(incrementalMakeResults: List<AbstractIncrementalJpsTest.MakeResult>): String =
-        buildString {
-            incrementalMakeResults.forEachIndexed { i, makeResult ->
-                if (i > 0) append("\n")
-                if (makeResult.name != null) {
-                    append("================ Step #${i + 1} ${makeResult.name} =================\n\n")
-                } else {
-                    append("================ Step #${i + 1} =================\n\n")
-                }
-                append(makeResult.log)
-            }
-        }
-
-    protected open fun doTest(testDataPath: String) {
-        testDataDir = File(testDataPath)
-        workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null)
-        additionalCommandLineArguments = parseAdditionalArgs(File(testDataPath))
-        val buildLogFile = buildLogFinder.findBuildLog(testDataDir)
-        Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) })
-
-        val modulesTxt = configureModules()
-        if (modulesTxt?.muted == true) return
-
-        initialMake()
-
-        val otherMakeResults = performModificationsAndMake(
-            modulesTxt?.modules?.map { it.name },
-            hasBuildLog = buildLogFile != null
-        )
-
-        buildLogFile?.let {
-            val logs = createBuildLog(otherMakeResults)
-            UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs)
-
-            val lastMakeResult = otherMakeResults.last()
-            clearCachesRebuildAndCheckOutput(lastMakeResult)
-        }
-    }
-
-    protected data class MakeResult(
-        val log: String,
-        val makeFailed: Boolean,
-        val mappingsDump: String?,
-        val name: String? = null
-    )
-
-    open val testDataSrc: File
-        get() = testDataDir
-
-    private fun performModificationsAndMake(
-        moduleNames: Collection<String>?,
-        hasBuildLog: Boolean
-    ): List<MakeResult> {
-        val results = arrayListOf<MakeResult>()
-        val modifications = getModificationsToPerform(
-            testDataSrc,
-            moduleNames,
-            allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData || !hasBuildLog,
-            touchPolicy = TouchPolicy.TIMESTAMP
-        )
-
-        if (!hasBuildLog) {
-            check(modifications.size == 1 && modifications.single().isEmpty()) {
-                "Bad test data: build steps are provided, but there is no `build.log` file"
-            }
-            return results
-        }
-
-        val stepsTxt = File(testDataSrc, "_steps.txt")
-        val modificationNames = if (stepsTxt.exists()) stepsTxt.readLines() else null
-
-        modifications.forEachIndexed { index, step ->
-            step.forEach { it.perform(workDir, mapWorkingToOriginalFile) }
-            performAdditionalModifications(step)
-            if (moduleNames == null) {
-                preProcessSources(File(workDir, "src"))
-            } else {
-                moduleNames.forEach { preProcessSources(File(workDir, "$it/src")) }
-            }
-
-            val name = modificationNames?.getOrNull(index)
-            val makeResult = make(name)
-            results.add(makeResult)
-        }
-        return results
-    }
-
-    protected open fun performAdditionalModifications(modifications: List<Modification>) {
-    }
-
-    protected open fun generateModuleSources(modulesTxt: ModulesTxt) = Unit
-
-    // null means one module
-    private fun configureModules(): ModulesTxt? {
-        JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject).outputUrl =
-            JpsPathUtil.pathToUrl(getAbsolutePath("out"))
-
-        val jdk = addJdk("my jdk")
-        val modulesTxt = readModulesTxt()
-        mapWorkingToOriginalFile = hashMapOf()
-
-        if (modulesTxt == null) configureSingleModuleProject(jdk)
-        else configureMultiModuleProject(modulesTxt, jdk)
-
-        overrideModuleSettings()
-        configureRequiredLibraries()
-
-        return modulesTxt
-    }
-
-    open fun overrideModuleSettings() {
-    }
-
-    private fun configureSingleModuleProject(jdk: JpsSdk<JpsDummyElement>?) {
-        addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk)
-
-        val sourceDestinationDir = File(workDir, "src")
-        val sourcesMapping = copyTestSources(testDataDir, File(workDir, "src"), "")
-        mapWorkingToOriginalFile.putAll(sourcesMapping)
-
-        preProcessSources(sourceDestinationDir)
-    }
-
-    protected open val ModulesTxt.Module.sourceFilePrefix: String
-        get() = "${name}_"
-
-    private fun configureMultiModuleProject(
-        modulesTxt: ModulesTxt,
-        jdk: JpsSdk<JpsDummyElement>?
-    ) {
-        modulesTxt.modules.forEach { module ->
-            module.jpsModule = addModule(
-                module.name,
-                arrayOf(getAbsolutePath("${module.name}/src")),
-                null,
-                null,
-                jdk
-            )!!
-
-            val kotlinFacetSettings = module.kotlinFacetSettings
-            if (kotlinFacetSettings != null) {
-                val compilerArguments = kotlinFacetSettings.compilerArguments
-                if (compilerArguments is K2MetadataCompilerArguments) {
-                    val out = getAbsolutePath("${module.name}/out")
-                    File(out).mkdirs()
-                    compilerArguments.destination = out
-                } else if (compilerArguments is K2JVMCompilerArguments) {
-                    compilerArguments.disableDefaultScriptingPlugin = true
-                }
-
-                module.jpsModule.container.setChild(
-                    JpsKotlinFacetModuleExtension.KIND,
-                    JpsKotlinFacetModuleExtension(kotlinFacetSettings)
-                )
-            }
-        }
-
-        modulesTxt.dependencies.forEach {
-            JpsModuleRootModificationUtil.addDependency(
-                it.from.jpsModule, it.to.jpsModule,
-                it.scope, it.exported
-            )
-        }
-
-        // configure module contents
-        generateModuleSources(modulesTxt)
-        modulesTxt.modules.forEach { module ->
-            val sourceDirName = "${module.name}/src"
-            val sourceDestinationDir = File(workDir, sourceDirName)
-            val sourcesMapping = copyTestSources(testDataSrc, sourceDestinationDir, module.sourceFilePrefix)
-            mapWorkingToOriginalFile.putAll(sourcesMapping)
-
-            preProcessSources(sourceDestinationDir)
-        }
-    }
-
-    private fun configureRequiredLibraries() {
-        myProject.modules.forEach { module ->
-            val platformKind = module.kotlinFacet?.settings?.targetPlatform?.idePlatformKind.orDefault()
-
-            when {
-                platformKind.isJvm -> {
-                    JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JvmStdLib))
-                    JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JvmTest))
-                }
-                platformKind.isJavaScript -> {
-                    JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JsStdLib))
-                    JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JsTest))
-                }
-            }
-        }
-    }
-
-    protected open fun preProcessSources(srcDir: File) {
-    }
-
-    override fun doGetProjectDir(): File? = workDir
-
-    internal class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase(), TestingBuildLogger {
-        private val markedDirtyBeforeRound = ArrayList<File>()
-        private val markedDirtyAfterRound = ArrayList<File>()
-        private val customMessages = mutableListOf<String>()
-
-        override fun invalidOrUnusedCache(
-            chunk: KotlinChunk?,
-            target: KotlinModuleBuildTarget<*>?,
-            attributesDiff: CacheAttributesDiff<*>
-        ) {
-            val cacheManager = attributesDiff.manager
-            val cacheTitle = when (cacheManager) {
-                is CacheVersionManager -> "Local cache for ${chunk ?: target}"
-                is CompositeLookupsCacheAttributesManager -> "Lookups cache"
-                else -> error("Unknown cache manager $cacheManager")
-            }
-
-            logLine("$cacheTitle are ${attributesDiff.status}")
-        }
-
-        override fun markedAsDirtyBeforeRound(files: Iterable<File>) {
-            markedDirtyBeforeRound.addAll(files)
-        }
-
-        override fun markedAsDirtyAfterRound(files: Iterable<File>) {
-            markedDirtyAfterRound.addAll(files)
-        }
-
-        override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {
-            logDirtyFiles(markedDirtyBeforeRound) // files can be marked as dirty during build start (KotlinCompileContext initialization)
-
-            if (!chunk.isDummy(context) && context.projectDescriptor.project.modules.size > 1) {
-                logLine("Building ${chunk.modules.sortedBy { it.name }.joinToString { it.name }}")
-            }
-        }
-
-        override fun afterChunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {
-            logDirtyFiles(markedDirtyBeforeRound)
-        }
-
-        override fun addCustomMessage(message: String) {
-            customMessages.add(message)
-        }
-
-        override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) {
-            customMessages.forEach {
-                logLine(it)
-            }
-            customMessages.clear()
-            logDirtyFiles(markedDirtyAfterRound)
-            logLine("Exit code: $exitCode")
-            logLine("------------------------------------------")
-        }
-
-        private fun logDirtyFiles(files: MutableList<File>) {
-            if (files.isEmpty()) return
-
-            logLine("Marked as dirty by Kotlin:")
-            files.apply {
-                map { FileUtil.toSystemIndependentName(it.path) }
-                    .sorted()
-                    .forEach { logLine(it) }
-
-                clear()
-            }
-        }
-
-        private val logBuf = StringBuilder()
-        val log: String
-            get() = logBuf.toString()
-
-        val compiledFiles = hashSetOf<File>()
-
-        override fun isEnabled(): Boolean = true
-
-        override fun logCompiledFiles(files: MutableCollection<File>?, builderName: String?, description: String?) {
-            super.logCompiledFiles(files, builderName, description)
-
-            if (builderName == KotlinBuilder.KOTLIN_BUILDER_NAME) {
-                compiledFiles.addAll(files!!)
-            }
-        }
-
-        override fun logLine(message: String?) {
-            logBuf.append(message!!.replace("^$rootPath/".toRegex(), "  ")).append('\n')
-        }
-    }
-}
-
-private fun createMappingsDump(
-    project: ProjectDescriptor,
-    kotlinContext: KotlinCompileContext,
-    lookupsDuringTest: Set<LookupSymbol>
-) = createKotlinCachesDump(project, kotlinContext, lookupsDuringTest) + "\n\n\n" +
-        createCommonMappingsDump(project) + "\n\n\n" +
-        createJavaMappingsDump(project)
-
-internal fun createKotlinCachesDump(
-    project: ProjectDescriptor,
-    kotlinContext: KotlinCompileContext,
-    lookupsDuringTest: Set<LookupSymbol>
-) = createKotlinIncrementalCacheDump(project, kotlinContext) + "\n\n\n" +
-        createLookupCacheDump(kotlinContext, lookupsDuringTest)
-
-private fun createKotlinIncrementalCacheDump(
-    project: ProjectDescriptor,
-    kotlinContext: KotlinCompileContext
-): String {
-    return buildString {
-        for (target in project.allModuleTargets.sortedBy { it.presentableName }) {
-            val kotlinCache = project.dataManager.getKotlinCache(kotlinContext.targetsBinding[target])
-            if (kotlinCache != null) {
-                append("<target $target>\n")
-                append(kotlinCache.dump())
-                append("</target $target>\n\n\n")
-            }
-        }
-    }
-}
-
-private fun createLookupCacheDump(kotlinContext: KotlinCompileContext, lookupsDuringTest: Set<LookupSymbol>): String {
-    val sb = StringBuilder()
-    val p = Printer(sb)
-    p.println("Begin of Lookup Maps")
-    p.println()
-
-    kotlinContext.lookupStorageManager.withLookupStorage { lookupStorage ->
-        lookupStorage.forceGC()
-        p.print(lookupStorage.dump(lookupsDuringTest))
-    }
-
-    p.println()
-    p.println("End of Lookup Maps")
-    return sb.toString()
-}
-
-private fun createCommonMappingsDump(project: ProjectDescriptor): String {
-    val resultBuf = StringBuilder()
-    val result = Printer(resultBuf)
-
-    result.println("Begin of SourceToOutputMap")
-    result.pushIndent()
-
-    for (target in project.allModuleTargets) {
-        result.println(target)
-        result.pushIndent()
-
-        val mapping = project.dataManager.getSourceToOutputMap(target)
-        mapping.sources.sorted().forEach {
-            val outputs = mapping.getOutputs(it)!!.sorted()
-            if (outputs.isNotEmpty()) {
-                result.println("source $it -> $outputs")
-            }
-        }
-
-        result.popIndent()
-    }
-
-    result.popIndent()
-    result.println("End of SourceToOutputMap")
-
-    return resultBuf.toString()
-}
-
-private fun createJavaMappingsDump(project: ProjectDescriptor): String {
-    val byteArrayOutputStream = ByteArrayOutputStream()
-    PrintStream(byteArrayOutputStream).use {
-        project.dataManager.mappings.toStream(it)
-    }
-    return byteArrayOutputStream.toString()
-}
-
-internal val ProjectDescriptor.allModuleTargets: Collection<ModuleBuildTarget>
-    get() = buildTargetIndex.allTargets.filterIsInstance<ModuleBuildTarget>()
-
-private val EXPORTED_SUFFIX = "[exported]"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt
deleted file mode 100644
index 2bf9c64be28d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJsJpsTest.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.config.KotlinFacetSettings
-import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder
-import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder.Companion.JS_JPS_LOG
-import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import java.io.File
-
-abstract class AbstractIncrementalJsJpsTest : AbstractIncrementalJpsTest() {
-    override val buildLogFinder: BuildLogFinder
-        get() = super.buildLogFinder.copy(isJsEnabled = true)
-
-    override fun doTest(testDataPath: String) {
-        val buildLogFile = File(testDataPath).resolve(JS_JPS_LOG)
-        if (!buildLogFile.exists()) {
-            buildLogFile.writeText("JPS JS LOG PLACEHOLDER")
-        }
-        super.doTest(testDataPath)
-    }
-
-    override fun overrideModuleSettings() {
-        myProject.modules.forEach {
-            val facet = KotlinFacetSettings()
-            facet.compilerArguments = K2JSCompilerArguments()
-            facet.targetPlatform = JsPlatforms.defaultJsPlatform
-
-            it.container.setChild(
-                JpsKotlinFacetModuleExtension.KIND,
-                JpsKotlinFacetModuleExtension(facet)
-            )
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt
deleted file mode 100644
index c5b2a92ae5b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJvmJpsTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.jps.model.k2JvmCompilerArguments
-
-abstract class AbstractIncrementalJvmJpsTest(
-    allowNoFilesWithSuffixInTestData: Boolean = false
-) : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData) {
-    override fun overrideModuleSettings() {
-        myProject.k2JvmCompilerArguments = K2JVMCompilerArguments().also {
-            it.disableDefaultScriptingPlugin = true
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
deleted file mode 100644
index 4280d4ae04bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.testFramework.UsefulTestCase
-import com.intellij.util.ThrowableRunnable
-import org.jetbrains.jps.builders.BuildTarget
-import org.jetbrains.jps.builders.storage.BuildDataPaths
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME
-import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner
-import org.jetbrains.kotlin.incremental.testingUtils.Modification
-import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent
-import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
-import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.utils.Printer
-import java.io.File
-
-abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() {
-    private val expectedCachesFileName: String
-        get() = "expected-kotlin-caches.txt"
-
-    private val enableICFixture = EnableICFixture()
-
-    override fun setUp() {
-        super.setUp()
-        enableICFixture.setUp()
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable { enableICFixture.tearDown() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    override fun doTest(testDataPath: String) {
-        super.doTest(testDataPath)
-
-        val actual = dumpKotlinCachesFileNames()
-        val expectedFile = File(testDataPath, expectedCachesFileName)
-        UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual)
-    }
-
-    override fun performAdditionalModifications(modifications: List<Modification>) {
-        super.performAdditionalModifications(modifications)
-
-        for (modification in modifications) {
-            if (modification !is ModifyContent) continue
-
-            val name = File(modification.path).name
-
-            when {
-                name.endsWith("incremental-compilation") -> {
-                    IncrementalCompilation.setIsEnabledForJvm(modification.dataFile.readAsBool())
-                }
-            }
-        }
-    }
-
-    fun File.readAsBool(): Boolean {
-        val content = this.readText()
-
-        return when (content.trim()) {
-            "on" -> true
-            "off" -> false
-            else -> throw IllegalStateException("$this content is expected to be 'on' or 'off'")
-        }
-    }
-
-    private fun dumpKotlinCachesFileNames(): String {
-        val sb = StringBuilder()
-        val printer = Printer(sb)
-        val chunks = kotlinCompileContext.targetsIndex.chunks
-        val dataManager = projectDescriptor.dataManager
-        val paths = dataManager.dataPaths
-
-        dumpCachesForTarget(
-            printer,
-            paths,
-            KotlinDataContainerTarget,
-            kotlinCompileContext.lookupsCacheAttributesManager.versionManagerForTesting.versionFileForTesting
-        )
-
-        data class TargetInChunk(val chunk: KotlinChunk, val target: KotlinModuleBuildTarget<*>)
-
-        val allTargets = chunks.flatMap { chunk ->
-            chunk.targets.map { target ->
-                TargetInChunk(chunk, target)
-            }
-        }.sortedBy { it.target.jpsModuleBuildTarget.presentableName }
-
-        allTargets.forEach { (chunk, target) ->
-            val metaBuildInfo = chunk.buildMetaInfoFile(target.jpsModuleBuildTarget)
-            dumpCachesForTarget(
-                printer, paths, target.jpsModuleBuildTarget,
-                target.localCacheVersionManager.versionFileForTesting,
-                metaBuildInfo.toFile(),
-                subdirectory = KOTLIN_CACHE_DIRECTORY_NAME
-            )
-        }
-
-
-        return sb.toString()
-    }
-
-    private fun dumpCachesForTarget(
-        p: Printer,
-        paths: BuildDataPaths,
-        target: BuildTarget<*>,
-        vararg cacheVersionsFiles: File,
-        subdirectory: String? = null
-    ) {
-        p.println(target)
-        p.pushIndent()
-
-        val dataRoot = paths.getTargetDataRoot(target).let { if (subdirectory != null) File(it, subdirectory) else it }
-        cacheVersionsFiles
-            .filter(File::exists)
-            .sortedBy { it.name }
-            .forEach { p.println(it.name) }
-
-        kotlinCacheNames(dataRoot).sorted().forEach { p.println(it) }
-
-        p.popIndent()
-    }
-
-    private fun kotlinCacheNames(dir: File): List<String> {
-        val result = arrayListOf<String>()
-
-        for (file in dir.walk()) {
-            if (file.isFile && file.extension == BasicMapsOwner.CACHE_EXTENSION) {
-                result.add(file.name)
-            }
-        }
-
-        return result
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
deleted file mode 100644
index c67de6ad1cf2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.model.JpsModuleRootModificationUtil
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.java.JpsJavaDependencyScope
-import org.jetbrains.jps.model.java.JpsJavaLibraryType
-import org.jetbrains.jps.model.library.JpsLibrary
-import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.kotlin.test.KotlinRoot
-import java.io.File
-import java.io.IOException
-
-abstract class AbstractKotlinJpsBuildTestCase : BaseKotlinJpsBuildTestCase() {
-    protected lateinit var workDir: File
-
-    @Throws(IOException::class)
-    override fun doGetProjectDir(): File? {
-        return workDir
-    }
-
-    protected fun addKotlinMockRuntimeDependency(): JpsLibrary {
-        return addDependency(KotlinJpsLibrary.MockRuntime)
-    }
-
-    protected fun addKotlinStdlibDependency(): JpsLibrary {
-        return addDependency(KotlinJpsLibrary.JvmStdLib)
-    }
-
-    protected fun addKotlinJavaScriptStdlibDependency(): JpsLibrary {
-        return addDependency(KotlinJpsLibrary.JsStdLib)
-    }
-
-    private fun addDependency(library: KotlinJpsLibrary): JpsLibrary {
-        return addDependency(myProject, library)
-    }
-
-    protected fun addDependency(libraryName: String, libraryFile: File): JpsLibrary {
-        return addDependency(myProject, libraryName, libraryFile)
-    }
-
-    companion object {
-        val TEST_DATA_PATH = KotlinRoot.DIR.absolutePath + "/jps/jps-plugin/tests/testData/"
-
-        @JvmStatic
-        protected fun addKotlinStdlibDependency(modules: Collection<JpsModule>, exported: Boolean = false): JpsLibrary {
-            return addDependency(modules, KotlinJpsLibrary.JvmStdLib, exported)
-        }
-
-        @JvmStatic
-        private fun addDependency(project: JpsProject, library: KotlinJpsLibrary, exported: Boolean = false): JpsLibrary {
-            return addDependency(JpsJavaDependencyScope.COMPILE, project.modules, exported, library.id, *library.roots)
-        }
-
-        @JvmStatic
-        private fun addDependency(modules: Collection<JpsModule>, library: KotlinJpsLibrary, exported: Boolean = false): JpsLibrary {
-            return addDependency(JpsJavaDependencyScope.COMPILE, modules, exported, library.id, *library.roots)
-        }
-
-        @JvmStatic
-        private fun addDependency(project: JpsProject, libraryName: String, libraryFile: File): JpsLibrary {
-            return addDependency(JpsJavaDependencyScope.COMPILE, project.modules, false, libraryName, libraryFile)
-        }
-
-        @JvmStatic
-        protected fun addDependency(
-            type: JpsJavaDependencyScope,
-            modules: Collection<JpsModule>,
-            exported: Boolean,
-            libraryName: String,
-            vararg file: File
-        ): JpsLibrary {
-            val library = modules.iterator().next().project.addLibrary(libraryName, JpsJavaLibraryType.INSTANCE)
-
-            for (fileRoot in file) {
-                library.addRoot(fileRoot, JpsOrderRootType.COMPILED)
-            }
-
-            for (module in modules) {
-                JpsModuleRootModificationUtil.addDependency(module, library, type, exported)
-            }
-            return library
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
deleted file mode 100644
index 449345f46ffe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+++ /dev/null
@@ -1,357 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.testFramework.UsefulTestCase
-import com.intellij.util.ThrowableRunnable
-import com.intellij.util.containers.StringInterner
-import org.jetbrains.kotlin.TestWithWorkingDir
-import org.jetbrains.kotlin.build.JvmSourceRoot
-import org.jetbrains.kotlin.cli.common.ExitCode
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
-import org.jetbrains.kotlin.compilerRunner.*
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.incremental.components.LookupInfo
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.components.Position
-import org.jetbrains.kotlin.incremental.components.ScopeKind
-import org.jetbrains.kotlin.incremental.isKotlinFile
-import org.jetbrains.kotlin.incremental.js.*
-import org.jetbrains.kotlin.incremental.makeModuleFile
-import org.jetbrains.kotlin.incremental.testingUtils.TouchPolicy
-import org.jetbrains.kotlin.incremental.testingUtils.copyTestSources
-import org.jetbrains.kotlin.incremental.testingUtils.getModificationsToPerform
-import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
-import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
-import org.jetbrains.kotlin.jps.incremental.createTestingCompilerEnvironment
-import org.jetbrains.kotlin.jps.incremental.runJSCompiler
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils
-import org.jetbrains.kotlin.utils.JsMetadataVersion
-import java.io.*
-import java.util.*
-
-abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() {
-
-    private val sourceToOutputMapping = hashMapOf<File, MutableSet<File>>()
-
-    override fun setUp() {
-        super.setUp()
-        sourceToOutputMapping.clear()
-    }
-
-    override fun markDirty(removedAndModifiedSources: Iterable<File>) {
-        for (sourceFile in removedAndModifiedSources) {
-            val outputs = sourceToOutputMapping.remove(sourceFile) ?: continue
-            for (output in outputs) {
-                output.delete()
-            }
-        }
-    }
-
-    override fun processCompilationResults(outputItemsCollector: OutputItemsCollectorImpl, services: Services) {
-        for ((sourceFiles, outputFile) in outputItemsCollector.outputs) {
-            if (outputFile.extension == "kotlin_module") continue
-
-            for (sourceFile in sourceFiles) {
-                val outputsForSource = sourceToOutputMapping.getOrPut(sourceFile) { hashSetOf() }
-                outputsForSource.add(outputFile)
-            }
-        }
-    }
-
-    override fun runCompiler(filesToCompile: Iterable<File>, env: JpsCompilerEnvironment): Any? {
-        val moduleFile = makeModuleFile(
-            name = "test",
-            isTest = true,
-            outputDir = outDir,
-            sourcesToCompile = filesToCompile.toList(),
-            commonSources = emptyList(),
-            javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)),
-            classpath = listOf(outDir, KotlinArtifacts.instance.kotlinStdlib).filter { it.exists() },
-            friendDirs = emptyList()
-        )
-
-        val args = K2JVMCompilerArguments().apply {
-            disableDefaultScriptingPlugin = true
-            buildFile = moduleFile.canonicalPath
-            reportOutputFiles = true
-        }
-        val argsArray = ArgumentUtils.convertArgumentsToStringList(args).toTypedArray()
-
-        try {
-            val stream = ByteArrayOutputStream()
-            val out = PrintStream(stream)
-            val exitCode = CompilerRunnerUtil.invokeExecMethod(K2JVMCompiler::class.java.name, argsArray, env, out)
-            val reader = BufferedReader(StringReader(stream.toString()))
-            CompilerOutputParser.parseCompilerMessagesFromReader(env.messageCollector, reader, env.outputItemsCollector)
-
-            return exitCode
-        }
-        finally {
-            moduleFile.delete()
-        }
-    }
-}
-
-abstract class AbstractJsKlibLookupTrackerTest : AbstractJsLookupTrackerTest() {
-    override val jsStdlibFile: File
-        get() = KotlinArtifacts.instance.kotlinStdlibJs
-
-    override fun configureAdditionalArgs(args: K2JSCompilerArguments) {
-        args.irProduceKlibDir = true
-        args.irOnly = true
-        args.outputFile = outDir.resolve("out.klib").absolutePath
-    }
-}
-
-abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() {
-    private var header: ByteArray? = null
-    private val packageParts: MutableMap<File, TranslationResultValue> = hashMapOf()
-    private val serializedIrFiles: MutableMap<File, IrTranslationResultValue> = hashMapOf()
-
-    override fun setUp() {
-        super.setUp()
-        header = null
-        packageParts.clear()
-        serializedIrFiles.clear()
-    }
-
-    override fun Services.Builder.registerAdditionalServices() {
-        if (header != null) {
-            register(
-                IncrementalDataProvider::class.java,
-                IncrementalDataProviderImpl(
-                    headerMetadata = header!!,
-                    compiledPackageParts = packageParts,
-                    metadataVersion = JsMetadataVersion.INSTANCE.toArray(),
-                    packageMetadata = emptyMap(), // TODO pass correct metadata
-                    serializedIrFiles = serializedIrFiles
-                )
-            )
-        }
-
-        register(IncrementalResultsConsumer::class.java, IncrementalResultsConsumerImpl())
-    }
-
-    override fun markDirty(removedAndModifiedSources: Iterable<File>) {
-        removedAndModifiedSources.forEach {
-            packageParts.remove(it)
-            serializedIrFiles.remove(it)
-        }
-    }
-
-    override fun processCompilationResults(outputItemsCollector: OutputItemsCollectorImpl, services: Services) {
-        val incrementalResults = services.get(IncrementalResultsConsumer::class.java) as IncrementalResultsConsumerImpl
-        header = incrementalResults.headerMetadata
-        packageParts.putAll(incrementalResults.packageParts)
-        serializedIrFiles.putAll(incrementalResults.irFileData)
-    }
-
-    protected open val jsStdlibFile: File
-        get() = KotlinArtifacts.instance.kotlinStdlibJs
-
-    protected open fun configureAdditionalArgs(args: K2JSCompilerArguments) {
-        args.outputFile = File(outDir, "out.js").canonicalPath
-    }
-
-    override fun runCompiler(filesToCompile: Iterable<File>, env: JpsCompilerEnvironment): Any? {
-        val args = K2JSCompilerArguments().apply {
-            val libPaths = arrayListOf(jsStdlibFile.absolutePath) + (libraries ?: "").split(File.pathSeparator)
-            libraries = libPaths.joinToString(File.pathSeparator)
-            reportOutputFiles = true
-            freeArgs = filesToCompile.map { it.canonicalPath }
-        }
-        configureAdditionalArgs(args)
-        return runJSCompiler(args, env)
-    }
-}
-
-abstract class AbstractLookupTrackerTest : TestWithWorkingDir() {
-    private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "operator fun", "val", "var")
-    private val DECLARATION_STARTS_WITH = DECLARATION_KEYWORDS.map { it + " " }
-    // ignore KDoc like comments which starts with `/**`, example: /** text */
-    private val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex()
-
-    protected lateinit var srcDir: File
-    protected lateinit var outDir: File
-    private val enableICFixture = EnableICFixture()
-
-    override fun setUp() {
-        super.setUp()
-        srcDir = File(workingDir, "src").apply { mkdirs() }
-        outDir = File(workingDir, "out")
-        enableICFixture.setUp()
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable { enableICFixture.tearDown() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    protected abstract fun markDirty(removedAndModifiedSources: Iterable<File>)
-    protected abstract fun processCompilationResults(outputItemsCollector: OutputItemsCollectorImpl, services: Services)
-    protected abstract fun runCompiler(filesToCompile: Iterable<File>, env: JpsCompilerEnvironment): Any?
-
-    fun doTest(path: String) {
-        val sb = StringBuilder()
-        fun StringBuilder.indentln(string: String) {
-            appendLine("  $string")
-        }
-        fun CompilerOutput.logOutput(stepName: String) {
-            sb.appendLine("==== $stepName ====")
-
-            sb.appendLine("Compiling files:")
-            for (compiledFile in compiledFiles.sortedBy { it.canonicalPath }) {
-                val lookupsFromFile = lookups[compiledFile]
-                val lookupStatus = when {
-                    lookupsFromFile == null -> "(unknown)"
-                    lookupsFromFile.isEmpty() -> "(no lookups)"
-                    else -> ""
-                }
-                val relativePath = compiledFile.toRelativeString(workingDir).replace("\\", "/")
-                sb.indentln("$relativePath$lookupStatus")
-            }
-
-            sb.appendLine("Exit code: $exitCode")
-            errors.forEach(sb::indentln)
-
-            sb.appendLine()
-        }
-
-        val testDir = File(path)
-        val workToOriginalFileMap = HashMap(copyTestSources(testDir, srcDir, filePrefix = ""))
-        var dirtyFiles = srcDir.walk().filterTo(HashSet()) { it.isKotlinFile(listOf("kt", "kts")) }
-        val steps = getModificationsToPerform(testDir, moduleNames = null, allowNoFilesWithSuffixInTestData = true, touchPolicy = TouchPolicy.CHECKSUM)
-                .filter { it.isNotEmpty() }
-
-        val filesToLookups = arrayListOf<Map<File, List<LookupInfo>>>()
-        fun CompilerOutput.originalFilesToLookups() =
-                compiledFiles.associateBy({ workToOriginalFileMap[it]!! }, { lookups[it] ?: emptyList() })
-
-        make(dirtyFiles).apply {
-            logOutput("INITIAL BUILD")
-            filesToLookups.add(originalFilesToLookups())
-
-        }
-        for ((i, modifications) in steps.withIndex()) {
-            dirtyFiles = modifications.mapNotNullTo(HashSet()) { it.perform(workingDir, workToOriginalFileMap) }
-            make(dirtyFiles).apply {
-                logOutput("STEP ${i + 1}")
-                filesToLookups.add(originalFilesToLookups())
-            }
-        }
-
-        val expectedBuildLog = File(testDir, "build.log")
-        UsefulTestCase.assertSameLinesWithFile(expectedBuildLog.canonicalPath, sb.toString())
-
-        assertEquals(steps.size + 1, filesToLookups.size)
-        for ((i, lookupsAtStepI) in filesToLookups.withIndex()) {
-            val step = if (i == 0) "INITIAL BUILD" else "STEP $i"
-            for ((file, lookups) in lookupsAtStepI) {
-                checkLookupsInFile(step, file, lookups)
-            }
-        }
-    }
-
-    private class CompilerOutput(
-        val exitCode: String,
-        val errors: List<String>,
-        val compiledFiles: Iterable<File>,
-        val lookups: Map<File, List<LookupInfo>>
-    )
-
-    private fun make(filesToCompile: Iterable<File>): CompilerOutput {
-        filesToCompile.forEach {
-            it.writeText(it.readText().replace(COMMENT_WITH_LOOKUP_INFO, ""))
-        }
-
-        markDirty(filesToCompile)
-        val lookupTracker = TestLookupTracker()
-        val messageCollector = TestMessageCollector()
-        val outputItemsCollector = OutputItemsCollectorImpl()
-        val services = Services.Builder().run {
-            register(LookupTracker::class.java, lookupTracker)
-            registerAdditionalServices()
-            build()
-        }
-        val environment = createTestingCompilerEnvironment(messageCollector, outputItemsCollector, services)
-        val exitCode = runCompiler(filesToCompile, environment) as? ExitCode
-        if (exitCode == ExitCode.OK) {
-            processCompilationResults(outputItemsCollector, environment.services)
-        }
-
-        val lookups = lookupTracker.lookups.groupBy { File(it.filePath) }
-        val lookupsFromCompiledFiles = filesToCompile.associate { it to (lookups[it] ?: emptyList()) }
-        return CompilerOutput(exitCode.toString(), messageCollector.errors, filesToCompile, lookupsFromCompiledFiles)
-    }
-
-    protected open fun Services.Builder.registerAdditionalServices() {}
-
-    private fun checkLookupsInFile(step: String, expectedFile: File, lookupsFromFile: List<LookupInfo>) {
-        val text = expectedFile.readText().replace(COMMENT_WITH_LOOKUP_INFO, "")
-        val lines = text.lines().toMutableList()
-
-        for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) {
-            val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first }
-
-            val lineContent = lines[line - 1]
-            val parts = ArrayList<CharSequence>(columnToLookups.size * 2)
-
-            var start = 0
-
-            for ((column, lookupsFromColumn) in columnToLookups) {
-                val end = column - 1
-                parts.add(lineContent.subSequence(start, end))
-
-                val lookups = lookupsFromColumn.mapTo(sortedSetOf()) {
-                    val rest = lineContent.substring(end)
-
-                    val name =
-                        when {
-                            rest.startsWith(it.name) || // same name
-                                rest.startsWith("$" + it.name) || // backing field
-                                DECLARATION_STARTS_WITH.any { rest.startsWith(it) } // it's declaration
-                            -> ""
-                            else -> "(" + it.name + ")"
-                        }
-
-                    it.scopeKind.toString()[0].toLowerCase()
-                        .toString() + ":" + it.scopeFqName.let { if (it.isNotEmpty()) it else "<root>" } + name
-                }.joinToString(separator = " ", prefix = "/*", postfix = "*/")
-
-                parts.add(lookups)
-
-                start = end
-            }
-
-            lines[line - 1] = parts.joinToString("") + lineContent.subSequence(start, lineContent.length)
-        }
-
-        val actual = lines.joinToString("\n")
-        KotlinTestUtils.assertEqualsToFile("Lookups do not match after $step", expectedFile, actual)
-    }
-}
-
-class TestLookupTracker : LookupTracker {
-    val lookups = arrayListOf<LookupInfo>()
-    private val interner = StringInterner()
-
-    override val requiresPosition: Boolean
-        get() = true
-
-    override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
-        val internedFilePath = interner.intern(filePath)
-        val internedScopeFqName = interner.intern(scopeFqName)
-        val internedName = interner.intern(name)
-
-        lookups.add(LookupInfo(internedFilePath, position, internedScopeFqName, scopeKind, internedName))
-    }
-}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractMultiplatformJpsTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractMultiplatformJpsTest.kt
deleted file mode 100644
index ec585bdb4701..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AbstractMultiplatformJpsTest.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt
-import org.jetbrains.kotlin.jps.build.dependeciestxt.MppJpsIncTestsGenerator
-import java.io.File
-
-abstract class AbstractMultiplatformJpsTestWithGeneratedContent : AbstractIncrementalJpsTest() {
-    override val modulesTxtFile: File
-        get() = File(testDataDir.parent, "dependencies.txt").also {
-            check(it.exists()) {
-                "`dependencies.txt` should be in parent dir. " +
-                        "See `jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md` for details"
-            }
-        }
-
-    override val testDataSrc: File
-        get() = File(workDir, "generatedTestDataSources")
-
-    override fun generateModuleSources(modulesTxt: ModulesTxt) {
-        testDataSrc.mkdirs()
-
-        val testCaseName = testDataDir.name
-
-        val generator = MppJpsIncTestsGenerator(modulesTxt) { testDataSrc }
-        val testCase = generator.testCases.find { it.name == testCaseName }
-            ?: error("Test case `$testCaseName` is not configured in ${modulesTxt.fileName}")
-        testCase.generate()
-    }
-
-    override val ModulesTxt.Module.sourceFilePrefix: String
-        get() = "${indexedName}_"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AsmVersionForJpsBuildTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AsmVersionForJpsBuildTest.kt
deleted file mode 100644
index 5f4e32cf8954..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/AsmVersionForJpsBuildTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.jps.build
-
-import junit.framework.TestCase
-import org.jetbrains.kotlin.codegen.AbstractClassBuilder
-import org.jetbrains.org.objectweb.asm.Opcodes
-import org.jetbrains.org.objectweb.asm.RecordComponentVisitor
-
-class AsmVersionForJpsBuildTest : TestCase() {
-    // Kotlin compiler contains some version of ASM that is taken from a particular platform dependency
-    fun testAsmVersionForBundledKotlinCompiler() {
-        val field = RecordComponentVisitor::class.java.getDeclaredField("api").also { it.trySetAccessible() }
-        val asmVersionForBundledCompiler = field.getInt(AbstractClassBuilder.EMPTY_RECORD_VISITOR)
-
-        assertEquals(Opcodes.ASM9, asmVersionForBundledCompiler)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
deleted file mode 100644
index 867b56f5ac8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.vfs.StandardFileSystems
-import com.intellij.util.ThrowableRunnable
-import com.intellij.util.io.URLUtil
-import org.jetbrains.jps.builders.JpsBuildTestCase
-import org.jetbrains.jps.model.JpsDummyElement
-import org.jetbrains.jps.model.java.JpsJavaSdkType
-import org.jetbrains.jps.model.library.JpsLibrary
-import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.jps.model.library.sdk.JpsSdk
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.test.AndroidStudioTestUtils
-
-abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() {
-    override fun setUp() {
-        super.setUp()
-        System.setProperty("kotlin.jps.tests", "true")
-    }
-
-    override fun shouldRunTest(): Boolean {
-        return super.shouldRunTest() && !AndroidStudioTestUtils.skipIncompatibleTestAgainstAndroidStudio()
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable {
-                System.clearProperty("kotlin.jps.tests")
-                myModel = null
-                myBuildParams.clear()
-            },
-            ThrowableRunnable { JpsKotlinCompilerRunner.releaseCompileServiceSession() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    override fun addJdk(name: String, path: String?): JpsSdk<JpsDummyElement> {
-        val homePath = System.getProperty("java.home")
-        val versionString = System.getProperty("java.version")
-        val jdk = myModel.global.addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE)
-        jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + homePath + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED)
-        return jdk.properties
-    }
-
-    private val libraries = mutableMapOf<String, JpsLibrary>()
-
-    protected fun requireLibrary(library: KotlinJpsLibrary) = libraries.getOrPut(library.id) {
-        library.create(myProject)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java
deleted file mode 100644
index 18b185f85da1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/cacheVersionChanged")
-public class DataContainerVersionChangedTestGenerated extends AbstractDataContainerVersionChangedTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("clearedHasKotlin")
-    public void testClearedHasKotlin() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/clearedHasKotlin/");
-    }
-
-    @TestMetadata("exportedModule")
-    public void testExportedModule() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/exportedModule/");
-    }
-
-    @TestMetadata("javaOnlyModulesAreNotAffected")
-    public void testJavaOnlyModulesAreNotAffected() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
-    }
-
-    @TestMetadata("module1Modified")
-    public void testModule1Modified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/module1Modified/");
-    }
-
-    @TestMetadata("module2Modified")
-    public void testModule2Modified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/module2Modified/");
-    }
-
-    @TestMetadata("moduleWithConstantModified")
-    public void testModuleWithConstantModified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
-    }
-
-    @TestMetadata("moduleWithInlineModified")
-    public void testModuleWithInlineModified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
-    }
-
-    @TestMetadata("touchedFile")
-    public void testTouchedFile() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/touchedFile/");
-    }
-
-    @TestMetadata("touchedOnlyJavaFile")
-    public void testTouchedOnlyJavaFile() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
-    }
-
-    @TestMetadata("untouchedFiles")
-    public void testUntouchedFiles() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/untouchedFiles/");
-    }
-
-    @TestMetadata("withError")
-    public void testWithError() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/withError/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java
deleted file mode 100644
index c538561e60b8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/cacheVersionChanged")
-public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("clearedHasKotlin")
-    public void testClearedHasKotlin() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/clearedHasKotlin/");
-    }
-
-    @TestMetadata("exportedModule")
-    public void testExportedModule() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/exportedModule/");
-    }
-
-    @TestMetadata("javaOnlyModulesAreNotAffected")
-    public void testJavaOnlyModulesAreNotAffected() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/");
-    }
-
-    @TestMetadata("module1Modified")
-    public void testModule1Modified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/module1Modified/");
-    }
-
-    @TestMetadata("module2Modified")
-    public void testModule2Modified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/module2Modified/");
-    }
-
-    @TestMetadata("moduleWithConstantModified")
-    public void testModuleWithConstantModified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/moduleWithConstantModified/");
-    }
-
-    @TestMetadata("moduleWithInlineModified")
-    public void testModuleWithInlineModified() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/moduleWithInlineModified/");
-    }
-
-    @TestMetadata("touchedFile")
-    public void testTouchedFile() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/touchedFile/");
-    }
-
-    @TestMetadata("touchedOnlyJavaFile")
-    public void testTouchedOnlyJavaFile() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/");
-    }
-
-    @TestMetadata("untouchedFiles")
-    public void testUntouchedFiles() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/untouchedFiles/");
-    }
-
-    @TestMetadata("withError")
-    public void testWithError() throws Exception {
-        runTest("testData/incremental/cacheVersionChanged/withError/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
deleted file mode 100644
index e5a13ee7c5ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.test.KotlinRoot
-import org.jetbrains.kotlin.idea.test.util.slashedPath
-
-class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() {
-    fun testJavaConstantChangedUsedInKotlin() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin")
-    }
-
-    fun testJavaConstantUnchangedUsedInKotlin() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin")
-    }
-
-    fun testKotlinConstantChangedUsedInJava() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava")
-    }
-
-    fun testKotlinJvmFieldChangedUsedInJava() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava")
-    }
-
-    fun testKotlinConstantUnchangedUsedInJava() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava")
-    }
-
-    fun testKotlinJvmFieldUnchangedUsedInJava() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava")
-    }
-
-    override fun doTest(testDataPath: String) {
-        super.doTest(KotlinRoot.DIR.resolve(testDataPath).slashedPath)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
deleted file mode 100644
index b4bd30db3d07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalCustomTests.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.kotlin.incremental.testingUtils.Modification
-import org.jetbrains.kotlin.test.KotlinRoot
-
-class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() {
-    fun testRenameModule() {
-        doTest(KotlinRoot.DIR.path + "/jps/jps-plugin/tests/testData/incremental/custom/renameModule/")
-    }
-
-    override fun performAdditionalModifications(modifications: List<Modification>) {
-        projectDescriptor.project.modules.forEach { it.name += "Renamed" }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java
deleted file mode 100644
index 3719ab823eb6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/multiModule/common")
-public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("classAdded")
-    public void testClassAdded() throws Exception {
-        runTest("testData/incremental/multiModule/common/classAdded/");
-    }
-
-    @TestMetadata("classRemoved")
-    public void testClassRemoved() throws Exception {
-        runTest("testData/incremental/multiModule/common/classRemoved/");
-    }
-
-    @TestMetadata("constantValueChanged")
-    public void testConstantValueChanged() throws Exception {
-        runTest("testData/incremental/multiModule/common/constantValueChanged/");
-    }
-
-    @TestMetadata("copyFileToAnotherModule")
-    public void testCopyFileToAnotherModule() throws Exception {
-        runTest("testData/incremental/multiModule/common/copyFileToAnotherModule/");
-    }
-
-    @TestMetadata("defaultArgumentInConstructorRemoved")
-    public void testDefaultArgumentInConstructorRemoved() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
-    }
-
-    @TestMetadata("defaultParameterAdded")
-    public void testDefaultParameterAdded() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultParameterAdded/");
-    }
-
-    @TestMetadata("defaultParameterAddedForTopLevelFun")
-    public void testDefaultParameterAddedForTopLevelFun() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
-    }
-
-    @TestMetadata("defaultParameterRemoved")
-    public void testDefaultParameterRemoved() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultParameterRemoved/");
-    }
-
-    @TestMetadata("defaultParameterRemovedForTopLevelFun")
-    public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
-    }
-
-    @TestMetadata("defaultValueInConstructorRemoved")
-    public void testDefaultValueInConstructorRemoved() throws Exception {
-        runTest("testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
-    }
-
-    @TestMetadata("duplicatedClass")
-    public void testDuplicatedClass() throws Exception {
-        runTest("testData/incremental/multiModule/common/duplicatedClass/");
-    }
-
-    @TestMetadata("exportedDependency")
-    public void testExportedDependency() throws Exception {
-        runTest("testData/incremental/multiModule/common/exportedDependency/");
-    }
-
-    @TestMetadata("functionFromDifferentPackageChanged")
-    public void testFunctionFromDifferentPackageChanged() throws Exception {
-        runTest("testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
-    }
-
-    @TestMetadata("inlineFunctionInlined")
-    public void testInlineFunctionInlined() throws Exception {
-        runTest("testData/incremental/multiModule/common/inlineFunctionInlined/");
-    }
-
-    @TestMetadata("inlineFunctionTwoPackageParts")
-    public void testInlineFunctionTwoPackageParts() throws Exception {
-        runTest("testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
-    }
-
-    @TestMetadata("moveFileToAnotherModule")
-    public void testMoveFileToAnotherModule() throws Exception {
-        runTest("testData/incremental/multiModule/common/moveFileToAnotherModule/");
-    }
-
-    @TestMetadata("simple")
-    public void testSimple() throws Exception {
-        runTest("testData/incremental/multiModule/common/simple/");
-    }
-
-    @TestMetadata("simpleDependency")
-    public void testSimpleDependency() throws Exception {
-        runTest("testData/incremental/multiModule/common/simpleDependency/");
-    }
-
-    @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
-    public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-        runTest("testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
-    }
-
-    @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
-    public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-        runTest("testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
-    }
-
-    @TestMetadata("simpleDependencyUnchanged")
-    public void testSimpleDependencyUnchanged() throws Exception {
-        runTest("testData/incremental/multiModule/common/simpleDependencyUnchanged/");
-    }
-
-    @TestMetadata("transitiveDependency")
-    public void testTransitiveDependency() throws Exception {
-        runTest("testData/incremental/multiModule/common/transitiveDependency/");
-    }
-
-    @TestMetadata("transitiveInlining")
-    public void testTransitiveInlining() throws Exception {
-        runTest("testData/incremental/multiModule/common/transitiveInlining/");
-    }
-
-    @TestMetadata("twoDependants")
-    public void testTwoDependants() throws Exception {
-        runTest("testData/incremental/multiModule/common/twoDependants/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java
deleted file mode 100644
index b89428cb3f5d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java
+++ /dev/null
@@ -1,1548 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-import org.jetbrains.kotlin.test.TargetBackend;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public abstract class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTest {
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/common")
-    public static class Common extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("classAdded")
-        public void testClassAdded() throws Exception {
-            runTest("testData/incremental/multiModule/common/classAdded/");
-        }
-
-        @TestMetadata("classRemoved")
-        public void testClassRemoved() throws Exception {
-            runTest("testData/incremental/multiModule/common/classRemoved/");
-        }
-
-        @TestMetadata("constantValueChanged")
-        public void testConstantValueChanged() throws Exception {
-            runTest("testData/incremental/multiModule/common/constantValueChanged/");
-        }
-
-        @TestMetadata("copyFileToAnotherModule")
-        public void testCopyFileToAnotherModule() throws Exception {
-            runTest("testData/incremental/multiModule/common/copyFileToAnotherModule/");
-        }
-
-        @TestMetadata("defaultArgumentInConstructorRemoved")
-        public void testDefaultArgumentInConstructorRemoved() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/");
-        }
-
-        @TestMetadata("defaultParameterAdded")
-        public void testDefaultParameterAdded() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultParameterAdded/");
-        }
-
-        @TestMetadata("defaultParameterAddedForTopLevelFun")
-        public void testDefaultParameterAddedForTopLevelFun() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/");
-        }
-
-        @TestMetadata("defaultParameterRemoved")
-        public void testDefaultParameterRemoved() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultParameterRemoved/");
-        }
-
-        @TestMetadata("defaultParameterRemovedForTopLevelFun")
-        public void testDefaultParameterRemovedForTopLevelFun() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/");
-        }
-
-        @TestMetadata("defaultValueInConstructorRemoved")
-        public void testDefaultValueInConstructorRemoved() throws Exception {
-            runTest("testData/incremental/multiModule/common/defaultValueInConstructorRemoved/");
-        }
-
-        @TestMetadata("duplicatedClass")
-        public void testDuplicatedClass() throws Exception {
-            runTest("testData/incremental/multiModule/common/duplicatedClass/");
-        }
-
-        @TestMetadata("exportedDependency")
-        public void testExportedDependency() throws Exception {
-            runTest("testData/incremental/multiModule/common/exportedDependency/");
-        }
-
-        @TestMetadata("functionFromDifferentPackageChanged")
-        public void testFunctionFromDifferentPackageChanged() throws Exception {
-            runTest("testData/incremental/multiModule/common/functionFromDifferentPackageChanged/");
-        }
-
-        @TestMetadata("inlineFunctionInlined")
-        public void testInlineFunctionInlined() throws Exception {
-            runTest("testData/incremental/multiModule/common/inlineFunctionInlined/");
-        }
-
-        @TestMetadata("inlineFunctionTwoPackageParts")
-        public void testInlineFunctionTwoPackageParts() throws Exception {
-            runTest("testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/");
-        }
-
-        @TestMetadata("moveFileToAnotherModule")
-        public void testMoveFileToAnotherModule() throws Exception {
-            runTest("testData/incremental/multiModule/common/moveFileToAnotherModule/");
-        }
-
-        @TestMetadata("simple")
-        public void testSimple() throws Exception {
-            runTest("testData/incremental/multiModule/common/simple/");
-        }
-
-        @TestMetadata("simpleDependency")
-        public void testSimpleDependency() throws Exception {
-            runTest("testData/incremental/multiModule/common/simpleDependency/");
-        }
-
-        @TestMetadata("simpleDependencyErrorOnAccessToInternal1")
-        public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception {
-            runTest("testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/");
-        }
-
-        @TestMetadata("simpleDependencyErrorOnAccessToInternal2")
-        public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception {
-            runTest("testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/");
-        }
-
-        @TestMetadata("simpleDependencyUnchanged")
-        public void testSimpleDependencyUnchanged() throws Exception {
-            runTest("testData/incremental/multiModule/common/simpleDependencyUnchanged/");
-        }
-
-        @TestMetadata("transitiveDependency")
-        public void testTransitiveDependency() throws Exception {
-            runTest("testData/incremental/multiModule/common/transitiveDependency/");
-        }
-
-        @TestMetadata("transitiveInlining")
-        public void testTransitiveInlining() throws Exception {
-            runTest("testData/incremental/multiModule/common/transitiveInlining/");
-        }
-
-        @TestMetadata("twoDependants")
-        public void testTwoDependants() throws Exception {
-            runTest("testData/incremental/multiModule/common/twoDependants/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/jvm")
-    public static class Jvm extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("circular")
-        public void testCircular() throws Exception {
-            runTest("testData/incremental/multiModule/jvm/circular/");
-        }
-
-        @TestMetadata("circularDependencyClasses")
-        public void testCircularDependencyClasses() throws Exception {
-            runTest("testData/incremental/multiModule/jvm/circularDependencyClasses/");
-        }
-
-        @TestMetadata("circularDependencySamePackageUnchanged")
-        public void testCircularDependencySamePackageUnchanged() throws Exception {
-            runTest("testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/");
-        }
-
-        @TestMetadata("circularDependencyTopLevelFunctions")
-        public void testCircularDependencyTopLevelFunctions() throws Exception {
-            runTest("testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/");
-        }
-
-        @TestMetadata("circularDependencyWithAccessToInternal")
-        public void testCircularDependencyWithAccessToInternal() throws Exception {
-            runTest("testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/multiplatform/custom")
-    public static class Custom extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("buildError")
-        public void testBuildError() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/buildError/");
-        }
-
-        @TestMetadata("buildError2Levels")
-        public void testBuildError2Levels() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/buildError2Levels/");
-        }
-
-        @TestMetadata("commonSourcesCompilerArg")
-        public void testCommonSourcesCompilerArg() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/");
-        }
-
-        @TestMetadata("complementaryFiles")
-        public void testComplementaryFiles() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/complementaryFiles/");
-        }
-
-        @TestMetadata("modifyOptionalAnnotationUsage")
-        public void testModifyOptionalAnnotationUsage() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/");
-        }
-
-        @TestMetadata("notSameCompiler")
-        public void testNotSameCompiler() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/custom/notSameCompiler/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/pureKotlin")
-    public static class PureKotlin extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("accessingFunctionsViaPackagePart")
-        public void testAccessingFunctionsViaPackagePart() throws Exception {
-            runTest("testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
-        }
-
-        @TestMetadata("accessingPropertiesViaField")
-        public void testAccessingPropertiesViaField() throws Exception {
-            runTest("testData/incremental/pureKotlin/accessingPropertiesViaField/");
-        }
-
-        @TestMetadata("addClass")
-        public void testAddClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/addClass/");
-        }
-
-        @TestMetadata("addFileWithFunctionOverload")
-        public void testAddFileWithFunctionOverload() throws Exception {
-            runTest("testData/incremental/pureKotlin/addFileWithFunctionOverload/");
-        }
-
-        @TestMetadata("addMemberTypeAlias")
-        public void testAddMemberTypeAlias() throws Exception {
-            runTest("testData/incremental/pureKotlin/addMemberTypeAlias/");
-        }
-
-        @TestMetadata("addTopLevelTypeAlias")
-        public void testAddTopLevelTypeAlias() throws Exception {
-            runTest("testData/incremental/pureKotlin/addTopLevelTypeAlias/");
-        }
-
-        @TestMetadata("allConstants")
-        public void testAllConstants() throws Exception {
-            runTest("testData/incremental/pureKotlin/allConstants/");
-        }
-
-        @TestMetadata("annotations")
-        public void testAnnotations() throws Exception {
-            runTest("testData/incremental/pureKotlin/annotations/");
-        }
-
-        @TestMetadata("anonymousObjectChanged")
-        public void testAnonymousObjectChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/anonymousObjectChanged/");
-        }
-
-        @TestMetadata("changeTypeImplicitlyWithCircularDependency")
-        public void testChangeTypeImplicitlyWithCircularDependency() throws Exception {
-            runTest("testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/");
-        }
-
-        @TestMetadata("changeWithRemovingUsage")
-        public void testChangeWithRemovingUsage() throws Exception {
-            runTest("testData/incremental/pureKotlin/changeWithRemovingUsage/");
-        }
-
-        @TestMetadata("classInlineFunctionChanged")
-        public void testClassInlineFunctionChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/classInlineFunctionChanged/");
-        }
-
-        @TestMetadata("classObjectConstantChanged")
-        public void testClassObjectConstantChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/classObjectConstantChanged/");
-        }
-
-        @TestMetadata("classRecreated")
-        public void testClassRecreated() throws Exception {
-            runTest("testData/incremental/pureKotlin/classRecreated/");
-        }
-
-        @TestMetadata("classRemoved")
-        public void testClassRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/classRemoved/");
-        }
-
-        @TestMetadata("classSignatureChanged")
-        public void testClassSignatureChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/classSignatureChanged/");
-        }
-
-        @TestMetadata("classSignatureUnchanged")
-        public void testClassSignatureUnchanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/classSignatureUnchanged/");
-        }
-
-        @TestMetadata("compilationErrorThenFixedOtherPackage")
-        public void testCompilationErrorThenFixedOtherPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/");
-        }
-
-        @TestMetadata("compilationErrorThenFixedSamePackage")
-        public void testCompilationErrorThenFixedSamePackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/");
-        }
-
-        @TestMetadata("compilationErrorThenFixedWithPhantomPart")
-        public void testCompilationErrorThenFixedWithPhantomPart() throws Exception {
-            runTest("testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/");
-        }
-
-        @TestMetadata("compilationErrorThenFixedWithPhantomPart2")
-        public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception {
-            runTest("testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/");
-        }
-
-        @TestMetadata("compilationErrorThenFixedWithPhantomPart3")
-        public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception {
-            runTest("testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/");
-        }
-
-        @TestMetadata("constantRemoved")
-        public void testConstantRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/constantRemoved/");
-        }
-
-        @TestMetadata("constantValueChanged")
-        public void testConstantValueChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/constantValueChanged/");
-        }
-
-        @TestMetadata("constantsUnchanged")
-        public void testConstantsUnchanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/constantsUnchanged/");
-        }
-
-        @TestMetadata("defaultArgumentInConstructorAdded")
-        public void testDefaultArgumentInConstructorAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/");
-        }
-
-        @TestMetadata("defaultArgumentInConstructorRemoved")
-        public void testDefaultArgumentInConstructorRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/");
-        }
-
-        @TestMetadata("defaultValueAdded")
-        public void testDefaultValueAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueAdded/");
-        }
-
-        @TestMetadata("defaultValueChanged")
-        public void testDefaultValueChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueChanged/");
-        }
-
-        @TestMetadata("defaultValueInConstructorChanged")
-        public void testDefaultValueInConstructorChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueInConstructorChanged/");
-        }
-
-        @TestMetadata("defaultValueInConstructorRemoved")
-        public void testDefaultValueInConstructorRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueInConstructorRemoved/");
-        }
-
-        @TestMetadata("defaultValueRemoved1")
-        public void testDefaultValueRemoved1() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueRemoved1/");
-        }
-
-        @TestMetadata("defaultValueRemoved2")
-        public void testDefaultValueRemoved2() throws Exception {
-            runTest("testData/incremental/pureKotlin/defaultValueRemoved2/");
-        }
-
-        @TestMetadata("delegatedPropertyInlineExtensionAccessor")
-        public void testDelegatedPropertyInlineExtensionAccessor() throws Exception {
-            runTest("testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/");
-        }
-
-        @TestMetadata("delegatedPropertyInlineMethodAccessor")
-        public void testDelegatedPropertyInlineMethodAccessor() throws Exception {
-            runTest("testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/");
-        }
-
-        @TestMetadata("dependencyClassReferenced")
-        public void testDependencyClassReferenced() throws Exception {
-            runTest("testData/incremental/pureKotlin/dependencyClassReferenced/");
-        }
-
-        @TestMetadata("fileWithConstantRemoved")
-        public void testFileWithConstantRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/fileWithConstantRemoved/");
-        }
-
-        @TestMetadata("fileWithInlineFunctionRemoved")
-        public void testFileWithInlineFunctionRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/");
-        }
-
-        @TestMetadata("filesExchangePackages")
-        public void testFilesExchangePackages() throws Exception {
-            runTest("testData/incremental/pureKotlin/filesExchangePackages/");
-        }
-
-        @TestMetadata("funRedeclaration")
-        public void testFunRedeclaration() throws Exception {
-            runTest("testData/incremental/pureKotlin/funRedeclaration/");
-        }
-
-        @TestMetadata("funVsConstructorOverloadConflict")
-        public void testFunVsConstructorOverloadConflict() throws Exception {
-            runTest("testData/incremental/pureKotlin/funVsConstructorOverloadConflict/");
-        }
-
-        @TestMetadata("functionBecameInline")
-        public void testFunctionBecameInline() throws Exception {
-            runTest("testData/incremental/pureKotlin/functionBecameInline/");
-        }
-
-        @TestMetadata("functionReferencingClass")
-        public void testFunctionReferencingClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/functionReferencingClass/");
-        }
-
-        @TestMetadata("independentClasses")
-        public void testIndependentClasses() throws Exception {
-            runTest("testData/incremental/pureKotlin/independentClasses/");
-        }
-
-        @TestMetadata("inlineFunctionBecomesNonInline")
-        public void testInlineFunctionBecomesNonInline() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/");
-        }
-
-        @TestMetadata("inlineFunctionUsageAdded")
-        public void testInlineFunctionUsageAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineFunctionUsageAdded/");
-        }
-
-        @TestMetadata("inlineFunctionsCircularDependency")
-        public void testInlineFunctionsCircularDependency() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
-        }
-
-        @TestMetadata("inlineFunctionsUnchanged")
-        public void testInlineFunctionsUnchanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
-        }
-
-        @TestMetadata("inlineLinesChanged")
-        public void testInlineLinesChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineLinesChanged/");
-        }
-
-        @TestMetadata("inlineModifiedWithUsage")
-        public void testInlineModifiedWithUsage() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineModifiedWithUsage/");
-        }
-
-        @TestMetadata("inlinePrivateFunctionAdded")
-        public void testInlinePrivateFunctionAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlinePrivateFunctionAdded/");
-        }
-
-        @TestMetadata("inlinePropertyInClass")
-        public void testInlinePropertyInClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlinePropertyInClass/");
-        }
-
-        @TestMetadata("inlinePropertyOnTopLevel")
-        public void testInlinePropertyOnTopLevel() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlinePropertyOnTopLevel/");
-        }
-
-        @TestMetadata("inlineSuspendFunctionChanged")
-        public void testInlineSuspendFunctionChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineSuspendFunctionChanged/");
-        }
-
-        @TestMetadata("inlineTwoFunctionsOneChanged")
-        public void testInlineTwoFunctionsOneChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/");
-        }
-
-        @TestMetadata("inlineUsedWhereDeclared")
-        public void testInlineUsedWhereDeclared() throws Exception {
-            runTest("testData/incremental/pureKotlin/inlineUsedWhereDeclared/");
-        }
-
-        @TestMetadata("innerClassesFromSupertypes")
-        public void testInnerClassesFromSupertypes() throws Exception {
-            runTest("testData/incremental/pureKotlin/innerClassesFromSupertypes/");
-        }
-
-        @TestMetadata("internalClassChanged")
-        public void testInternalClassChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/internalClassChanged/");
-        }
-
-        @TestMetadata("internalMemberInClassChanged")
-        public void testInternalMemberInClassChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/internalMemberInClassChanged/");
-        }
-
-        @TestMetadata("internalTypealias")
-        public void testInternalTypealias() throws Exception {
-            runTest("testData/incremental/pureKotlin/internalTypealias/");
-        }
-
-        @TestMetadata("internalTypealiasConstructor")
-        public void testInternalTypealiasConstructor() throws Exception {
-            runTest("testData/incremental/pureKotlin/internalTypealiasConstructor/");
-        }
-
-        @TestMetadata("internalTypealiasObject")
-        public void testInternalTypealiasObject() throws Exception {
-            runTest("testData/incremental/pureKotlin/internalTypealiasObject/");
-        }
-
-        @TestMetadata("localClassChanged")
-        public void testLocalClassChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/localClassChanged/");
-        }
-
-        @TestMetadata("moveClass")
-        public void testMoveClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/moveClass/");
-        }
-
-        @TestMetadata("moveFileWithChangingPackage")
-        public void testMoveFileWithChangingPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/moveFileWithChangingPackage/");
-        }
-
-        @TestMetadata("moveFileWithoutChangingPackage")
-        public void testMoveFileWithoutChangingPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/moveFileWithoutChangingPackage/");
-        }
-
-        @TestMetadata("multiplePackagesModified")
-        public void testMultiplePackagesModified() throws Exception {
-            runTest("testData/incremental/pureKotlin/multiplePackagesModified/");
-        }
-
-        @TestMetadata("objectConstantChanged")
-        public void testObjectConstantChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/objectConstantChanged/");
-        }
-
-        @TestMetadata("ourClassReferenced")
-        public void testOurClassReferenced() throws Exception {
-            runTest("testData/incremental/pureKotlin/ourClassReferenced/");
-        }
-
-        @TestMetadata("overloadInlined")
-        public void testOverloadInlined() throws Exception {
-            runTest("testData/incremental/pureKotlin/overloadInlined/");
-        }
-
-        @TestMetadata("packageConstantChanged")
-        public void testPackageConstantChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageConstantChanged/");
-        }
-
-        @TestMetadata("packageFileAdded")
-        public void testPackageFileAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageFileAdded/");
-        }
-
-        @TestMetadata("packageFileChangedPackage")
-        public void testPackageFileChangedPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageFileChangedPackage/");
-        }
-
-        @TestMetadata("packageFileChangedThenOtherRemoved")
-        public void testPackageFileChangedThenOtherRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
-        }
-
-        @TestMetadata("packageFileRemoved")
-        public void testPackageFileRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageFileRemoved/");
-        }
-
-        @TestMetadata("packageFilesChangedInTurn")
-        public void testPackageFilesChangedInTurn() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageFilesChangedInTurn/");
-        }
-
-        @TestMetadata("packageInlineFunctionAccessingField")
-        public void testPackageInlineFunctionAccessingField() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
-        }
-
-        @TestMetadata("packageInlineFunctionFromOurPackage")
-        public void testPackageInlineFunctionFromOurPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
-        }
-
-        @TestMetadata("packagePrivateOnlyChanged")
-        public void testPackagePrivateOnlyChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/packagePrivateOnlyChanged/");
-        }
-
-        @TestMetadata("packageRecreated")
-        public void testPackageRecreated() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageRecreated/");
-        }
-
-        @TestMetadata("packageRecreatedAfterRenaming")
-        public void testPackageRecreatedAfterRenaming() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
-        }
-
-        @TestMetadata("packageRemoved")
-        public void testPackageRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/packageRemoved/");
-        }
-
-        @TestMetadata("parameterWithDefaultValueAdded")
-        public void testParameterWithDefaultValueAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/parameterWithDefaultValueAdded/");
-        }
-
-        @TestMetadata("parameterWithDefaultValueRemoved")
-        public void testParameterWithDefaultValueRemoved() throws Exception {
-            runTest("testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/");
-        }
-
-        @TestMetadata("privateConstantsChanged")
-        public void testPrivateConstantsChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateConstantsChanged/");
-        }
-
-        @TestMetadata("privateMethodAdded")
-        public void testPrivateMethodAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateMethodAdded/");
-        }
-
-        @TestMetadata("privateMethodDeleted")
-        public void testPrivateMethodDeleted() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateMethodDeleted/");
-        }
-
-        @TestMetadata("privateMethodSignatureChanged")
-        public void testPrivateMethodSignatureChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateMethodSignatureChanged/");
-        }
-
-        @TestMetadata("privateSecondaryConstructorAdded")
-        public void testPrivateSecondaryConstructorAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateSecondaryConstructorAdded/");
-        }
-
-        @TestMetadata("privateSecondaryConstructorDeleted")
-        public void testPrivateSecondaryConstructorDeleted() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/");
-        }
-
-        @TestMetadata("privateValAccessorChanged")
-        public void testPrivateValAccessorChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateValAccessorChanged/");
-        }
-
-        @TestMetadata("privateValAdded")
-        public void testPrivateValAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateValAdded/");
-        }
-
-        @TestMetadata("privateValDeleted")
-        public void testPrivateValDeleted() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateValDeleted/");
-        }
-
-        @TestMetadata("privateValSignatureChanged")
-        public void testPrivateValSignatureChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateValSignatureChanged/");
-        }
-
-        @TestMetadata("privateVarAdded")
-        public void testPrivateVarAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateVarAdded/");
-        }
-
-        @TestMetadata("privateVarDeleted")
-        public void testPrivateVarDeleted() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateVarDeleted/");
-        }
-
-        @TestMetadata("privateVarSignatureChanged")
-        public void testPrivateVarSignatureChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/privateVarSignatureChanged/");
-        }
-
-        @TestMetadata("propertyRedeclaration")
-        public void testPropertyRedeclaration() throws Exception {
-            runTest("testData/incremental/pureKotlin/propertyRedeclaration/");
-        }
-
-        @TestMetadata("publicPropertyWithPrivateSetter")
-        public void testPublicPropertyWithPrivateSetter() throws Exception {
-            runTest("testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/");
-        }
-
-        @TestMetadata("removeAndRestoreCompanion")
-        public void testRemoveAndRestoreCompanion() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeAndRestoreCompanion/");
-        }
-
-        @TestMetadata("removeAndRestoreCompanionWithImplicitUsages")
-        public void testRemoveAndRestoreCompanionWithImplicitUsages() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/");
-        }
-
-        @TestMetadata("removeClass")
-        public void testRemoveClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeClass/");
-        }
-
-        @TestMetadata("removeClassInDefaultPackage")
-        public void testRemoveClassInDefaultPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeClassInDefaultPackage/");
-        }
-
-        @TestMetadata("removeFileWithFunctionOverload")
-        public void testRemoveFileWithFunctionOverload() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeFileWithFunctionOverload/");
-        }
-
-        @TestMetadata("removeMemberTypeAlias")
-        public void testRemoveMemberTypeAlias() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeMemberTypeAlias/");
-        }
-
-        @TestMetadata("removeTopLevelTypeAlias")
-        public void testRemoveTopLevelTypeAlias() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeTopLevelTypeAlias/");
-        }
-
-        @TestMetadata("removeUnusedFile")
-        public void testRemoveUnusedFile() throws Exception {
-            runTest("testData/incremental/pureKotlin/removeUnusedFile/");
-        }
-
-        @TestMetadata("renameClass")
-        public void testRenameClass() throws Exception {
-            runTest("testData/incremental/pureKotlin/renameClass/");
-        }
-
-        @TestMetadata("renameFileWithFunctionOverload")
-        public void testRenameFileWithFunctionOverload() throws Exception {
-            runTest("testData/incremental/pureKotlin/renameFileWithFunctionOverload/");
-        }
-
-        @TestMetadata("returnTypeChanged")
-        public void testReturnTypeChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/returnTypeChanged/");
-        }
-
-        @TestMetadata("sealedClassesAddImplements")
-        public void testSealedClassesAddImplements() throws Exception {
-            runTest("testData/incremental/pureKotlin/sealedClassesAddImplements/");
-        }
-
-        @TestMetadata("sealedClassesAddInheritor")
-        public void testSealedClassesAddInheritor() throws Exception {
-            runTest("testData/incremental/pureKotlin/sealedClassesAddInheritor/");
-        }
-
-        @TestMetadata("sealedClassesRemoveImplements")
-        public void testSealedClassesRemoveImplements() throws Exception {
-            runTest("testData/incremental/pureKotlin/sealedClassesRemoveImplements/");
-        }
-
-        @TestMetadata("sealedClassesRemoveInheritor")
-        public void testSealedClassesRemoveInheritor() throws Exception {
-            runTest("testData/incremental/pureKotlin/sealedClassesRemoveInheritor/");
-        }
-
-        @TestMetadata("sealedClassesUseSwitch")
-        public void testSealedClassesUseSwitch() throws Exception {
-            runTest("testData/incremental/pureKotlin/sealedClassesUseSwitch/");
-        }
-
-        @TestMetadata("secondaryConstructorInlined")
-        public void testSecondaryConstructorInlined() throws Exception {
-            runTest("testData/incremental/pureKotlin/secondaryConstructorInlined/");
-        }
-
-        @TestMetadata("simpleClassDependency")
-        public void testSimpleClassDependency() throws Exception {
-            runTest("testData/incremental/pureKotlin/simpleClassDependency/");
-        }
-
-        @TestMetadata("soleFileChangesPackage")
-        public void testSoleFileChangesPackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/soleFileChangesPackage/");
-        }
-
-        @TestMetadata("subpackage")
-        public void testSubpackage() throws Exception {
-            runTest("testData/incremental/pureKotlin/subpackage/");
-        }
-
-        @TestMetadata("suspendWithStateMachine")
-        public void testSuspendWithStateMachine() throws Exception {
-            runTest("testData/incremental/pureKotlin/suspendWithStateMachine/");
-        }
-
-        @TestMetadata("topLevelFunctionSameSignature")
-        public void testTopLevelFunctionSameSignature() throws Exception {
-            runTest("testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
-        }
-
-        @TestMetadata("topLevelMembersInTwoFiles")
-        public void testTopLevelMembersInTwoFiles() throws Exception {
-            runTest("testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
-        }
-
-        @TestMetadata("topLevelPrivateValUsageAdded")
-        public void testTopLevelPrivateValUsageAdded() throws Exception {
-            runTest("testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/");
-        }
-
-        @TestMetadata("traitClassObjectConstantChanged")
-        public void testTraitClassObjectConstantChanged() throws Exception {
-            runTest("testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
-        }
-
-        @TestMetadata("valAddCustomAccessor")
-        public void testValAddCustomAccessor() throws Exception {
-            runTest("testData/incremental/pureKotlin/valAddCustomAccessor/");
-        }
-
-        @TestMetadata("valRemoveCustomAccessor")
-        public void testValRemoveCustomAccessor() throws Exception {
-            runTest("testData/incremental/pureKotlin/valRemoveCustomAccessor/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/withJava")
-    public abstract static class WithJava extends AbstractIncrementalJvmJpsTest {
-        @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/incremental/withJava/convertBetweenJavaAndKotlin")
-        public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJvmJpsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-            }
-
-            @TestMetadata("javaToKotlin")
-            public void testJavaToKotlin() throws Exception {
-                runTest("testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/");
-            }
-
-            @TestMetadata("javaToKotlinAndBack")
-            public void testJavaToKotlinAndBack() throws Exception {
-                runTest("testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/");
-            }
-
-            @TestMetadata("javaToKotlinAndRemove")
-            public void testJavaToKotlinAndRemove() throws Exception {
-                runTest("testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/");
-            }
-
-            @TestMetadata("kotlinToJava")
-            public void testKotlinToJava() throws Exception {
-                runTest("testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/");
-            }
-        }
-
-        @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/incremental/withJava/javaUsedInKotlin")
-        public static class JavaUsedInKotlin extends AbstractIncrementalJvmJpsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-            }
-
-            @TestMetadata("changeFieldType")
-            public void testChangeFieldType() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeFieldType/");
-            }
-
-            @TestMetadata("changeNotUsedSignature")
-            public void testChangeNotUsedSignature() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/");
-            }
-
-            @TestMetadata("changePropertyOverrideType")
-            public void testChangePropertyOverrideType() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/");
-            }
-
-            @TestMetadata("changeSignature")
-            public void testChangeSignature() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeSignature/");
-            }
-
-            @TestMetadata("changeSignaturePackagePrivate")
-            public void testChangeSignaturePackagePrivate() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/");
-            }
-
-            @TestMetadata("changeSignaturePackagePrivateNonRoot")
-            public void testChangeSignaturePackagePrivateNonRoot() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/");
-            }
-
-            @TestMetadata("changeSignatureStatic")
-            public void testChangeSignatureStatic() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/");
-            }
-
-            @TestMetadata("constantChanged")
-            public void testConstantChanged() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/constantChanged/");
-            }
-
-            @TestMetadata("constantUnchanged")
-            public void testConstantUnchanged() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/");
-            }
-
-            @TestMetadata("enumEntryAdded")
-            public void testEnumEntryAdded() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/");
-            }
-
-            @TestMetadata("enumEntryRemoved")
-            public void testEnumEntryRemoved() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/");
-            }
-
-            @TestMetadata("javaAndKotlinChangedSimultaneously")
-            public void testJavaAndKotlinChangedSimultaneously() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/");
-            }
-
-            @TestMetadata("javaFieldNullabilityChanged")
-            public void testJavaFieldNullabilityChanged() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/");
-            }
-
-            @TestMetadata("javaMethodParamNullabilityChanged")
-            public void testJavaMethodParamNullabilityChanged() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/");
-            }
-
-            @TestMetadata("javaMethodReturnTypeNullabilityChanged")
-            public void testJavaMethodReturnTypeNullabilityChanged() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/");
-            }
-
-            @TestMetadata("methodAddedInSuper")
-            public void testMethodAddedInSuper() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/");
-            }
-
-            @TestMetadata("methodRenamed")
-            public void testMethodRenamed() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/methodRenamed/");
-            }
-
-            @TestMetadata("mixedInheritance")
-            public void testMixedInheritance() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/");
-            }
-
-            @TestMetadata("notChangeSignature")
-            public void testNotChangeSignature() throws Exception {
-                runTest("testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/");
-            }
-
-            @RunWith(JUnit3RunnerWithInners.class)
-            @TestMetadata("testData/incremental/withJava/javaUsedInKotlin/samConversions")
-            public static class SamConversions extends AbstractIncrementalJvmJpsTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-                }
-
-                @TestMetadata("methodAdded")
-                public void testMethodAdded() throws Exception {
-                    runTest("testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/");
-                }
-
-                @TestMetadata("methodAddedSamAdapter")
-                public void testMethodAddedSamAdapter() throws Exception {
-                    runTest("testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/");
-                }
-
-                @TestMetadata("methodSignatureChanged")
-                public void testMethodSignatureChanged() throws Exception {
-                    runTest("testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/");
-                }
-
-                @TestMetadata("methodSignatureChangedSamAdapter")
-                public void testMethodSignatureChangedSamAdapter() throws Exception {
-                    runTest("testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/");
-                }
-            }
-        }
-
-        @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/incremental/withJava/kotlinUsedInJava")
-        public static class KotlinUsedInJava extends AbstractIncrementalJvmJpsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-            }
-
-            @TestMetadata("addOptionalParameter")
-            public void testAddOptionalParameter() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/");
-            }
-
-            @TestMetadata("changeNotUsedSignature")
-            public void testChangeNotUsedSignature() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/");
-            }
-
-            @TestMetadata("changeSignature")
-            public void testChangeSignature() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/changeSignature/");
-            }
-
-            @TestMetadata("constantChanged")
-            public void testConstantChanged() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/constantChanged/");
-            }
-
-            @TestMetadata("constantUnchanged")
-            public void testConstantUnchanged() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/");
-            }
-
-            @TestMetadata("funRenamed")
-            public void testFunRenamed() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/funRenamed/");
-            }
-
-            @TestMetadata("jvmFieldChanged")
-            public void testJvmFieldChanged() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/");
-            }
-
-            @TestMetadata("jvmFieldUnchanged")
-            public void testJvmFieldUnchanged() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/");
-            }
-
-            @TestMetadata("methodAddedInSuper")
-            public void testMethodAddedInSuper() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/");
-            }
-
-            @TestMetadata("notChangeSignature")
-            public void testNotChangeSignature() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/");
-            }
-
-            @TestMetadata("onlyTopLevelFunctionInFileRemoved")
-            public void testOnlyTopLevelFunctionInFileRemoved() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/");
-            }
-
-            @TestMetadata("packageFileAdded")
-            public void testPackageFileAdded() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/");
-            }
-
-            @TestMetadata("privateChanges")
-            public void testPrivateChanges() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/privateChanges/");
-            }
-
-            @TestMetadata("propertyRenamed")
-            public void testPropertyRenamed() throws Exception {
-                runTest("testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/");
-            }
-        }
-
-        @RunWith(JUnit3RunnerWithInners.class)
-        @TestMetadata("testData/incremental/withJava/other")
-        public static class Other extends AbstractIncrementalJvmJpsTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-            }
-
-            @TestMetadata("accessingFunctionsViaRenamedFileClass")
-            public void testAccessingFunctionsViaRenamedFileClass() throws Exception {
-                runTest("testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/");
-            }
-
-            @TestMetadata("allKotlinFilesRemovedThenNewAdded")
-            public void testAllKotlinFilesRemovedThenNewAdded() throws Exception {
-                runTest("testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/");
-            }
-
-            @TestMetadata("classRedeclaration")
-            public void testClassRedeclaration() throws Exception {
-                runTest("testData/incremental/withJava/other/classRedeclaration/");
-            }
-
-            @TestMetadata("classToPackageFacade")
-            public void testClassToPackageFacade() throws Exception {
-                runTest("testData/incremental/withJava/other/classToPackageFacade/");
-            }
-
-            @TestMetadata("conflictingPlatformDeclarations")
-            public void testConflictingPlatformDeclarations() throws Exception {
-                runTest("testData/incremental/withJava/other/conflictingPlatformDeclarations/");
-            }
-
-            @TestMetadata("defaultValueInConstructorAdded")
-            public void testDefaultValueInConstructorAdded() throws Exception {
-                runTest("testData/incremental/withJava/other/defaultValueInConstructorAdded/");
-            }
-
-            @TestMetadata("inlineFunctionWithJvmNameInClass")
-            public void testInlineFunctionWithJvmNameInClass() throws Exception {
-                runTest("testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/");
-            }
-
-            @TestMetadata("inlineTopLevelFunctionWithJvmName")
-            public void testInlineTopLevelFunctionWithJvmName() throws Exception {
-                runTest("testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/");
-            }
-
-            @TestMetadata("inlineTopLevelValPropertyWithJvmName")
-            public void testInlineTopLevelValPropertyWithJvmName() throws Exception {
-                runTest("testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/");
-            }
-
-            @TestMetadata("innerClassNotGeneratedWhenRebuilding")
-            public void testInnerClassNotGeneratedWhenRebuilding() throws Exception {
-                runTest("testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/");
-            }
-
-            @TestMetadata("jvmNameChanged")
-            public void testJvmNameChanged() throws Exception {
-                runTest("testData/incremental/withJava/other/jvmNameChanged/");
-            }
-
-            @TestMetadata("mainRedeclaration")
-            public void testMainRedeclaration() throws Exception {
-                runTest("testData/incremental/withJava/other/mainRedeclaration/");
-            }
-
-            @TestMetadata("multifileClassAddTopLevelFunWithDefault")
-            public void testMultifileClassAddTopLevelFunWithDefault() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/");
-            }
-
-            @TestMetadata("multifileClassFileAdded")
-            public void testMultifileClassFileAdded() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassFileAdded/");
-            }
-
-            @TestMetadata("multifileClassFileChanged")
-            public void testMultifileClassFileChanged() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassFileChanged/");
-            }
-
-            @TestMetadata("multifileClassFileMovedToAnotherMultifileClass")
-            public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/");
-            }
-
-            @TestMetadata("multifileClassInlineFunction")
-            public void testMultifileClassInlineFunction() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassInlineFunction/");
-            }
-
-            @TestMetadata("multifileClassInlineFunctionAccessingField")
-            public void testMultifileClassInlineFunctionAccessingField() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/");
-            }
-
-            @TestMetadata("multifileClassRecreated")
-            public void testMultifileClassRecreated() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassRecreated/");
-            }
-
-            @TestMetadata("multifileClassRecreatedAfterRenaming")
-            public void testMultifileClassRecreatedAfterRenaming() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/");
-            }
-
-            @TestMetadata("multifileClassRemoved")
-            public void testMultifileClassRemoved() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileClassRemoved/");
-            }
-
-            @TestMetadata("multifileDependantUsage")
-            public void testMultifileDependantUsage() throws Exception {
-                runTest("testData/incremental/withJava/other/multifileDependantUsage/");
-            }
-
-            @TestMetadata("multifilePackagePartMethodAdded")
-            public void testMultifilePackagePartMethodAdded() throws Exception {
-                runTest("testData/incremental/withJava/other/multifilePackagePartMethodAdded/");
-            }
-
-            @TestMetadata("multifilePartsWithProperties")
-            public void testMultifilePartsWithProperties() throws Exception {
-                runTest("testData/incremental/withJava/other/multifilePartsWithProperties/");
-            }
-
-            @TestMetadata("optionalParameter")
-            public void testOptionalParameter() throws Exception {
-                runTest("testData/incremental/withJava/other/optionalParameter/");
-            }
-
-            @TestMetadata("packageFacadeToClass")
-            public void testPackageFacadeToClass() throws Exception {
-                runTest("testData/incremental/withJava/other/packageFacadeToClass/");
-            }
-
-            @TestMetadata("packageMultifileClassOneFileWithPublicChanges")
-            public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception {
-                runTest("testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/");
-            }
-
-            @TestMetadata("packageMultifileClassPrivateOnlyChanged")
-            public void testPackageMultifileClassPrivateOnlyChanged() throws Exception {
-                runTest("testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/");
-            }
-
-            @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade")
-            public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception {
-                runTest("testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/");
-            }
-
-            @TestMetadata("topLevelFunctionWithJvmName")
-            public void testTopLevelFunctionWithJvmName() throws Exception {
-                runTest("testData/incremental/withJava/other/topLevelFunctionWithJvmName/");
-            }
-
-            @TestMetadata("topLevelPropertyWithJvmName")
-            public void testTopLevelPropertyWithJvmName() throws Exception {
-                runTest("testData/incremental/withJava/other/topLevelPropertyWithJvmName/");
-            }
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/inlineFunCallSite")
-    public static class InlineFunCallSite extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("classProperty")
-        public void testClassProperty() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/classProperty/");
-        }
-
-        @TestMetadata("companionObjectProperty")
-        public void testCompanionObjectProperty() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/companionObjectProperty/");
-        }
-
-        @TestMetadata("coroutine")
-        public void testCoroutine() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/coroutine/");
-        }
-
-        @TestMetadata("function")
-        public void testFunction() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/function/");
-        }
-
-        @TestMetadata("getter")
-        public void testGetter() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/getter/");
-        }
-
-        @TestMetadata("lambda")
-        public void testLambda() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/lambda/");
-        }
-
-        @TestMetadata("localFun")
-        public void testLocalFun() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/localFun/");
-        }
-
-        @TestMetadata("method")
-        public void testMethod() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/method/");
-        }
-
-        @TestMetadata("parameterDefaultValue")
-        public void testParameterDefaultValue() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/parameterDefaultValue/");
-        }
-
-        @TestMetadata("primaryConstructorParameterDefaultValue")
-        public void testPrimaryConstructorParameterDefaultValue() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/");
-        }
-
-        @TestMetadata("superCall")
-        public void testSuperCall() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/superCall/");
-        }
-
-        @TestMetadata("thisCall")
-        public void testThisCall() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/thisCall/");
-        }
-
-        @TestMetadata("topLevelObjectProperty")
-        public void testTopLevelObjectProperty() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/topLevelObjectProperty/");
-        }
-
-        @TestMetadata("topLevelProperty")
-        public void testTopLevelProperty() throws Exception {
-            runTest("testData/incremental/inlineFunCallSite/topLevelProperty/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/classHierarchyAffected")
-    public static class ClassHierarchyAffected extends AbstractIncrementalJvmJpsTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, TargetBackend.JVM_IR, testDataFilePath);
-        }
-
-        @TestMetadata("annotationFlagRemoved")
-        public void testAnnotationFlagRemoved() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/annotationFlagRemoved/");
-        }
-
-        @TestMetadata("annotationListChanged")
-        public void testAnnotationListChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/annotationListChanged/");
-        }
-
-        @TestMetadata("bridgeGenerated")
-        public void testBridgeGenerated() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/bridgeGenerated/");
-        }
-
-        @TestMetadata("classBecameFinal")
-        public void testClassBecameFinal() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classBecameFinal/");
-        }
-
-        @TestMetadata("classBecameInterface")
-        public void testClassBecameInterface() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classBecameInterface/");
-        }
-
-        @TestMetadata("classBecamePrivate")
-        public void testClassBecamePrivate() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classBecamePrivate/");
-        }
-
-        @TestMetadata("classMovedIntoOtherClass")
-        public void testClassMovedIntoOtherClass() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/");
-        }
-
-        @TestMetadata("classRemoved")
-        public void testClassRemoved() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classRemoved/");
-        }
-
-        @TestMetadata("classRemovedAndRestored")
-        public void testClassRemovedAndRestored() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/classRemovedAndRestored/");
-        }
-
-        @TestMetadata("companionObjectInheritedMemberChanged")
-        public void testCompanionObjectInheritedMemberChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/");
-        }
-
-        @TestMetadata("companionObjectMemberChanged")
-        public void testCompanionObjectMemberChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/companionObjectMemberChanged/");
-        }
-
-        @TestMetadata("companionObjectNameChanged")
-        public void testCompanionObjectNameChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/companionObjectNameChanged/");
-        }
-
-        @TestMetadata("companionObjectToSimpleObject")
-        public void testCompanionObjectToSimpleObject() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/");
-        }
-
-        @TestMetadata("constructorVisibilityChanged")
-        public void testConstructorVisibilityChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/constructorVisibilityChanged/");
-        }
-
-        @TestMetadata("enumEntryAdded")
-        public void testEnumEntryAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/enumEntryAdded/");
-        }
-
-        @TestMetadata("enumEntryRemoved")
-        public void testEnumEntryRemoved() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/enumEntryRemoved/");
-        }
-
-        @TestMetadata("enumMemberChanged")
-        public void testEnumMemberChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/enumMemberChanged/");
-        }
-
-        @TestMetadata("flagsAndMemberInDifferentClassesChanged")
-        public void testFlagsAndMemberInDifferentClassesChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/");
-        }
-
-        @TestMetadata("flagsAndMemberInSameClassChanged")
-        public void testFlagsAndMemberInSameClassChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/");
-        }
-
-        @TestMetadata("implcitUpcast")
-        public void testImplcitUpcast() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/implcitUpcast/");
-        }
-
-        @TestMetadata("inferredTypeArgumentChanged")
-        public void testInferredTypeArgumentChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/");
-        }
-
-        @TestMetadata("inferredTypeChanged")
-        public void testInferredTypeChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/inferredTypeChanged/");
-        }
-
-        @TestMetadata("interfaceAnyMethods")
-        public void testInterfaceAnyMethods() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/interfaceAnyMethods/");
-        }
-
-        @TestMetadata("lambdaParameterAffected")
-        public void testLambdaParameterAffected() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/lambdaParameterAffected/");
-        }
-
-        @TestMetadata("methodAdded")
-        public void testMethodAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/methodAdded/");
-        }
-
-        @TestMetadata("methodAnnotationAdded")
-        public void testMethodAnnotationAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/methodAnnotationAdded/");
-        }
-
-        @TestMetadata("methodNullabilityChanged")
-        public void testMethodNullabilityChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/methodNullabilityChanged/");
-        }
-
-        @TestMetadata("methodParameterWithDefaultValueAdded")
-        public void testMethodParameterWithDefaultValueAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/");
-        }
-
-        @TestMetadata("methodRemoved")
-        public void testMethodRemoved() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/methodRemoved/");
-        }
-
-        @TestMetadata("overrideExplicit")
-        public void testOverrideExplicit() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/overrideExplicit/");
-        }
-
-        @TestMetadata("overrideImplicit")
-        public void testOverrideImplicit() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/overrideImplicit/");
-        }
-
-        @TestMetadata("propertyNullabilityChanged")
-        public void testPropertyNullabilityChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/propertyNullabilityChanged/");
-        }
-
-        @TestMetadata("sealedClassImplAdded")
-        public void testSealedClassImplAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/sealedClassImplAdded/");
-        }
-
-        @TestMetadata("sealedClassIndirectImplAdded")
-        public void testSealedClassIndirectImplAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/");
-        }
-
-        @TestMetadata("sealedClassNestedImplAdded")
-        public void testSealedClassNestedImplAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/");
-        }
-
-        @TestMetadata("secondaryConstructorAdded")
-        public void testSecondaryConstructorAdded() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/secondaryConstructorAdded/");
-        }
-
-        @TestMetadata("starProjectionUpperBoundChanged")
-        public void testStarProjectionUpperBoundChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/");
-        }
-
-        @TestMetadata("supertypesListChanged")
-        public void testSupertypesListChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/supertypesListChanged/");
-        }
-
-        @TestMetadata("typeParameterListChanged")
-        public void testTypeParameterListChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/typeParameterListChanged/");
-        }
-
-        @TestMetadata("varianceChanged")
-        public void testVarianceChanged() throws Exception {
-            runTest("testData/incremental/classHierarchyAffected/varianceChanged/");
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
deleted file mode 100644
index a15ec6add8e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public abstract class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest {
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/lazyKotlinCaches")
-    public static class LazyKotlinCaches extends AbstractIncrementalLazyCachesTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("class")
-        public void testClass() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/class/");
-        }
-
-        @TestMetadata("classInheritance")
-        public void testClassInheritance() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/classInheritance/");
-        }
-
-        @TestMetadata("constant")
-        public void testConstant() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/constant/");
-        }
-
-        @TestMetadata("function")
-        public void testFunction() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/function/");
-        }
-
-        @TestMetadata("inlineFunctionWithUsage")
-        public void testInlineFunctionWithUsage() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/");
-        }
-
-        @TestMetadata("inlineFunctionWithoutUsage")
-        public void testInlineFunctionWithoutUsage() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/");
-        }
-
-        @TestMetadata("noKotlin")
-        public void testNoKotlin() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/noKotlin/");
-        }
-
-        @TestMetadata("topLevelPropertyAccess")
-        public void testTopLevelPropertyAccess() throws Exception {
-            runTest("testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/changeIncrementalOption")
-    public static class ChangeIncrementalOption extends AbstractIncrementalLazyCachesTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("incrementalOff")
-        public void testIncrementalOff() throws Exception {
-            runTest("testData/incremental/changeIncrementalOption/incrementalOff/");
-        }
-
-        @TestMetadata("incrementalOffOn")
-        public void testIncrementalOffOn() throws Exception {
-            runTest("testData/incremental/changeIncrementalOption/incrementalOffOn/");
-        }
-
-        @TestMetadata("incrementalOffOnJavaChanged")
-        public void testIncrementalOffOnJavaChanged() throws Exception {
-            runTest("testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/");
-        }
-
-        @TestMetadata("incrementalOffOnJavaOnly")
-        public void testIncrementalOffOnJavaOnly() throws Exception {
-            runTest("testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/");
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
deleted file mode 100644
index 48fb5b3d6cef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.SystemInfoRt
-import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.kotlin.incremental.testingUtils.Modification
-import org.jetbrains.kotlin.test.KotlinRoot
-import org.jetbrains.kotlin.idea.test.util.slashedPath
-
-class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) {
-    fun testProjectPathCaseChanged() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged")
-    }
-
-    fun testProjectPathCaseChangedMultiFile() {
-        doTest("jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile")
-    }
-
-    override fun doTest(testDataPath: String) {
-        if (SystemInfoRt.isFileSystemCaseSensitive) {
-            return
-        }
-
-        super.doTest(KotlinRoot.DIR.resolve(testDataPath).slashedPath)
-    }
-
-    override fun performAdditionalModifications(modifications: List<Modification>) {
-        val module = myProject.modules[0]
-        val sourceRoot = module.sourceRoots[0].url
-        assert(sourceRoot.endsWith("/src"))
-        val newSourceRoot = sourceRoot.replace("/src", "/SRC")
-        module.removeSourceRoot(sourceRoot, JavaSourceRootType.SOURCE)
-        module.addSourceRoot(newSourceRoot, JavaSourceRootType.SOURCE)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt
deleted file mode 100644
index adc850d55e63..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JoinToReadableStringTest.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import junit.framework.TestCase
-
-class JoinToReadableStringTest : TestCase() {
-    fun test0() {
-        assertEquals(
-            "",
-            listOf<String>().joinToReadableString()
-        )
-    }
-
-    fun test1() {
-        assertEquals(
-            "a",
-            listOf("a").joinToReadableString()
-        )
-    }
-
-    fun test2() {
-        assertEquals(
-            "a and b",
-            listOf("a", "b").joinToReadableString()
-        )
-    }
-
-    fun test3() {
-        assertEquals(
-            "a, b and c",
-            listOf("a", "b", "c").joinToReadableString()
-        )
-    }
-
-    fun test4() {
-        assertEquals(
-            "a, b, c and d",
-            listOf("a", "b", "c", "d").joinToReadableString()
-        )
-    }
-
-    fun test5() {
-        assertEquals(
-            "a, b, c, d and e",
-            listOf("a", "b", "c", "d", "e").joinToReadableString()
-        )
-    }
-
-    fun test6() {
-        assertEquals(
-            "a, b, c, d, e and 1 more",
-            listOf("a", "b", "c", "d", "e", "f").joinToReadableString()
-        )
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java
deleted file mode 100644
index 80fc6b90ec38..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/lookupTracker/jsKlib")
-public class JsKlibLookupTrackerTestGenerated extends AbstractJsKlibLookupTrackerTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("classifierMembers")
-    public void testClassifierMembers() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/classifierMembers/");
-    }
-
-    @TestMetadata("conventions")
-    public void testConventions() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/conventions/");
-    }
-
-    @TestMetadata("expressionType")
-    public void testExpressionType() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/expressionType/");
-    }
-
-    @TestMetadata("localDeclarations")
-    public void testLocalDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/localDeclarations/");
-    }
-
-    @TestMetadata("packageDeclarations")
-    public void testPackageDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/packageDeclarations/");
-    }
-
-    @TestMetadata("simple")
-    public void testSimple() throws Exception {
-        runTest("testData/incremental/lookupTracker/jsKlib/simple/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java
deleted file mode 100644
index b168df03c24b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/lookupTracker/js")
-public class JsLookupTrackerTestGenerated extends AbstractJsLookupTrackerTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("classifierMembers")
-    public void testClassifierMembers() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/classifierMembers/");
-    }
-
-    @TestMetadata("conventions")
-    public void testConventions() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/conventions/");
-    }
-
-    @TestMetadata("expressionType")
-    public void testExpressionType() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/expressionType/");
-    }
-
-    @TestMetadata("localDeclarations")
-    public void testLocalDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/localDeclarations/");
-    }
-
-    @TestMetadata("packageDeclarations")
-    public void testPackageDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/packageDeclarations/");
-    }
-
-    @TestMetadata("simple")
-    public void testSimple() throws Exception {
-        runTest("testData/incremental/lookupTracker/js/simple/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java
deleted file mode 100644
index 4e43b830e6fd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/lookupTracker/jvm")
-public class JvmLookupTrackerTestGenerated extends AbstractJvmLookupTrackerTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    @TestMetadata("classifierMembers")
-    public void testClassifierMembers() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/classifierMembers/");
-    }
-
-    @TestMetadata("conventions")
-    public void testConventions() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/conventions/");
-    }
-
-    @TestMetadata("expressionType")
-    public void testExpressionType() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/expressionType/");
-    }
-
-    @TestMetadata("java")
-    public void testJava() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/java/");
-    }
-
-    @TestMetadata("localDeclarations")
-    public void testLocalDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/localDeclarations/");
-    }
-
-    @TestMetadata("packageDeclarations")
-    public void testPackageDeclarations() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/packageDeclarations/");
-    }
-
-    @TestMetadata("SAM")
-    public void testSAM() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/SAM/");
-    }
-
-    @TestMetadata("simple")
-    public void testSimple() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/simple/");
-    }
-
-    @TestMetadata("syntheticProperties")
-    public void testSyntheticProperties() throws Exception {
-        runTest("testData/incremental/lookupTracker/jvm/syntheticProperties/");
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
deleted file mode 100644
index bd05f9194ef3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ /dev/null
@@ -1,1055 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
-import com.intellij.openapi.util.io.FileUtilRt
-import com.intellij.openapi.util.text.StringUtil
-import com.intellij.testFramework.LightVirtualFile
-import com.intellij.testFramework.UsefulTestCase
-import com.intellij.util.io.Decompressor
-import com.intellij.util.io.ZipUtil
-import org.jetbrains.jps.ModuleChunk
-import org.jetbrains.jps.api.CanceledStatus
-import org.jetbrains.jps.builders.BuildResult
-import org.jetbrains.jps.builders.CompileScopeTestBuilder
-import org.jetbrains.jps.builders.TestProjectBuilderLogger
-import org.jetbrains.jps.builders.impl.BuildDataPathsImpl
-import org.jetbrains.jps.builders.logging.BuildLoggingManager
-import org.jetbrains.jps.cmdline.ProjectDescriptor
-import org.jetbrains.jps.devkit.model.JpsPluginModuleType
-import org.jetbrains.jps.incremental.BuilderRegistry
-import org.jetbrains.jps.incremental.CompileContext
-import org.jetbrains.jps.incremental.IncProjectBuilder
-import org.jetbrains.jps.incremental.ModuleLevelBuilder
-import org.jetbrains.jps.incremental.messages.BuildMessage
-import org.jetbrains.jps.incremental.messages.CompilerMessage
-import org.jetbrains.jps.model.JpsModuleRootModificationUtil
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.java.JavaSourceRootType
-import org.jetbrains.jps.model.java.JpsJavaDependencyScope
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.cli.common.Usage
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
-import org.jetbrains.kotlin.codegen.AsmUtil
-import org.jetbrains.kotlin.codegen.JvmCodegenUtil
-import org.jetbrains.kotlin.config.IncrementalCompilation
-import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.*
-import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
-import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments
-import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
-import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.idea.test.KotlinCompilerStandalone
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils
-import org.jetbrains.kotlin.utils.Printer
-import org.jetbrains.org.objectweb.asm.ClassReader
-import org.jetbrains.org.objectweb.asm.ClassVisitor
-import org.jetbrains.org.objectweb.asm.MethodVisitor
-import org.jetbrains.org.objectweb.asm.Opcodes
-import org.junit.Assert
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.FileOutputStream
-import java.io.IOException
-import java.net.URLClassLoader
-import java.util.*
-import java.util.zip.ZipOutputStream
-
-open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
-    companion object {
-        private const val ADDITIONAL_MODULE_NAME = "module2"
-
-        private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class")
-        private val NOTHING = arrayOf<String>()
-        private const val KOTLIN_JS_LIBRARY = "jslib-example"
-        private const val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar"
-        private val PATH_TO_KOTLIN_JS_LIBRARY =
-            TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY
-
-        private fun getMethodsOfClass(classFile: File): Set<String> {
-            val result = TreeSet<String>()
-            ClassReader(FileUtil.loadFileBytes(classFile)).accept(object : ClassVisitor(Opcodes.API_VERSION) {
-                override fun visitMethod(
-                    access: Int,
-                    name: String,
-                    desc: String,
-                    signature: String?,
-                    exceptions: Array<String>?
-                ): MethodVisitor? {
-                    result.add(name)
-                    return null
-                }
-            }, 0)
-            return result
-        }
-
-        @JvmStatic
-        protected fun klass(moduleName: String, classFqName: String): String {
-            val outputDirPrefix = "out/production/$moduleName/"
-            return outputDirPrefix + classFqName.replace('.', '/') + ".class"
-        }
-
-        @JvmStatic
-        protected fun module(moduleName: String): String {
-            return "out/production/$moduleName/${JvmCodegenUtil.getMappingFileName(moduleName)}"
-        }
-    }
-
-    protected fun doTest() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-    }
-
-    protected fun doTestWithRuntime() {
-        initProject(JVM_FULL_RUNTIME)
-        buildAllModules().assertSuccessful()
-    }
-
-    protected fun doTestWithKotlinJavaScriptLibrary() {
-        initProject(JS_STDLIB)
-        createKotlinJavaScriptLibraryArchive()
-        addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR))
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinProject() {
-        doTest()
-
-        checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "Test1Kt"))
-    }
-
-    fun testSourcePackagePrefix() {
-        doTest()
-    }
-
-    fun testSourcePackageLongPrefix() {
-        initProject(JVM_MOCK_RUNTIME)
-        val buildResult = buildAllModules()
-        buildResult.assertSuccessful()
-        val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING)
-        assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 1, warnings.size)
-        assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText)
-    }
-
-    fun testSourcePackagePrefixWithInnerClasses() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptProject() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, pathsToDelete = k2jsOutput(PROJECT_NAME))
-    }
-
-    private fun k2jsOutput(vararg moduleNames: String): Array<String> {
-        val moduleNamesSet = moduleNames.toSet()
-        val list = mutableListOf<String>()
-
-        myProject.modules.forEach { module ->
-            if (module.name in moduleNamesSet) {
-                val outputDir = module.productionBuildTarget.outputDir!!
-                list.add(toSystemIndependentName(File("$outputDir/${module.name}.js").relativeTo(workDir).path))
-                list.add(toSystemIndependentName(File("$outputDir/${module.name}.meta.js").relativeTo(workDir).path))
-
-                val kjsmFiles = outputDir.walk().filter { it.isFile && it.extension.equals("kjsm", ignoreCase = true) }
-
-                list.addAll(kjsmFiles.map { toSystemIndependentName(it.relativeTo(workDir).path) })
-            }
-        }
-
-        return list.toTypedArray()
-    }
-
-    fun testKotlinJavaScriptProjectNewSourceRootTypes() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList()
-    }
-
-    fun testKotlinJavaScriptProjectWithCustomOutputPaths() {
-        initProject(JS_STDLIB_WITHOUT_FACET)
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList(File(workDir, "target"))
-    }
-
-    fun testKotlinJavaScriptProjectWithSourceMap() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText()
-        val expectedPath = "prefix-dir/src/pkg/test1.kt"
-        assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\""))
-
-        val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map")
-        assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists())
-    }
-
-    fun testKotlinJavaScriptProjectWithSourceMapRelativePaths() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText()
-        val expectedPath = "../../../src/pkg/test1.kt"
-        assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\""))
-
-        val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map")
-        assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists())
-    }
-
-    fun testKotlinJavaScriptProjectWithTwoModules() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-        checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME))
-        checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME))
-    }
-
-    @WorkingDir("KotlinJavaScriptProjectWithTwoModules")
-    fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() {
-        initProject()
-        createKotlinJavaScriptLibraryArchive()
-        addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR))
-        addKotlinJavaScriptStdlibDependency()
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() {
-        initProject()
-        setupKotlinJSFacet()
-        val jslibJar = KotlinArtifacts.instance.kotlinStdlibJs
-        val jslibDir = File(workDir, "KotlinJavaScript")
-        try {
-            Decompressor.Zip(jslibJar).extract(jslibDir.toPath())
-        } catch (ex: IOException) {
-            throw IllegalStateException(ex.message)
-        }
-
-        addDependency("KotlinJavaScript", jslibDir)
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-    }
-
-    fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() {
-        initProject(JS_STDLIB)
-        addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY))
-        buildAllModules().assertSuccessful()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-    }
-
-    fun testKotlinJavaScriptProjectWithLibrary() {
-        doTestWithKotlinJavaScriptLibrary()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-    }
-
-    fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() {
-        doTestWithKotlinJavaScriptLibrary()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-    }
-
-    fun testKotlinJavaScriptProjectWithLibraryNoCopy() {
-        doTestWithKotlinJavaScriptLibrary()
-
-        checkOutputFilesList()
-        checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME))
-    }
-
-    fun testKotlinJavaScriptProjectWithLibraryAndErrors() {
-        initProject(JS_STDLIB)
-        createKotlinJavaScriptLibraryArchive()
-        addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR))
-        buildAllModules().assertFailed()
-
-        checkOutputFilesList()
-    }
-
-    fun testKotlinJavaScriptProjectWithEmptyDependencies() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptInternalFromSpecialRelatedModule() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptProjectWithTests() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies() {
-        initProject(JS_STDLIB)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency() {
-        initProject(JS_STDLIB)
-        val buildResult = buildAllModules()
-        buildResult.assertSuccessful()
-
-        val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING)
-        assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size)
-    }
-
-    fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() {
-        initProject(JS_STDLIB)
-        val buildResult = buildAllModules()
-        buildResult.assertSuccessful()
-
-        val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING)
-        assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size)
-    }
-
-    fun testExcludeFolderInSourceRoot() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "Foo.class")
-        assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
-
-        checkWhen(
-            touch("src/foo.kt"), null,
-            arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
-        )
-    }
-
-    fun testExcludeModuleFolderInSourceRootOfAnotherModule() {
-        doTest()
-
-        for (module in myProject.modules) {
-            assertFilesExistInOutput(module, "Foo.class")
-        }
-
-        checkWhen(
-            touch("src/foo.kt"), null,
-            arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
-        )
-        checkWhen(
-            touch("src/module2/src/foo.kt"), null,
-            arrayOf(klass("module2", "Foo"), module("module2"))
-        )
-    }
-
-    fun testExcludeFileUsingCompilerSettings() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "Foo.class", "Bar.class")
-        assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("src/foo.kt"), null, allClasses)
-        }
-
-        checkWhen(touch("src/Excluded.kt"), null, NOTHING)
-        checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING)
-    }
-
-    fun testExcludeFolderNonRecursivelyUsingCompilerSettings() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "Foo.class", "Bar.class")
-        assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
-            checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar")))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("src/foo.kt"), null, allClasses)
-            checkWhen(touch("src/dir/subdir/bar.kt"), null, allClasses)
-        }
-
-        checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING)
-        checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING)
-    }
-
-    fun testExcludeFolderRecursivelyUsingCompilerSettings() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "Foo.class", "Bar.class")
-        assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("src/foo.kt"), null, allClasses)
-        }
-
-        checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING)
-        checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING)
-        checkWhen(touch("src/exclude/subdir/Excluded.kt"), null, NOTHING)
-        checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING)
-    }
-
-    fun testKotlinProjectTwoFilesInOnePackage() {
-        doTest()
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage"))
-            checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage"))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("src/test1.kt"), null, allClasses)
-            checkWhen(touch("src/test2.kt"), null, allClasses)
-        }
-
-        checkWhen(
-            arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING,
-            arrayOf(
-                packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"),
-                packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"),
-                module("kotlinProject")
-            )
-        )
-
-        assertFilesNotExistInOutput(myProject.modules[0], "_DefaultPackage.class")
-    }
-
-    fun testDefaultLanguageVersionCustomApiVersion() {
-        initProject(JVM_FULL_RUNTIME)
-        buildAllModules().assertFailed()
-
-        assertEquals(1, myProject.modules.size)
-        val module = myProject.modules.first()
-        val args = module.kotlinCompilerArguments
-        args.apiVersion = "1.4"
-        myProject.kotlinCommonCompilerArguments = args
-
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testKotlinJavaProject() {
-        doTestWithRuntime()
-    }
-
-    fun testJKJProject() {
-        doTestWithRuntime()
-    }
-
-    fun testKJKProject() {
-        doTestWithRuntime()
-    }
-
-    fun testKJCircularProject() {
-        doTestWithRuntime()
-    }
-
-    fun testJKJInheritanceProject() {
-        doTestWithRuntime()
-    }
-
-    fun testKJKInheritanceProject() {
-        doTestWithRuntime()
-    }
-
-    fun testCircularDependenciesNoKotlinFiles() {
-        doTest()
-    }
-
-    fun testCircularDependenciesDifferentPackages() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-
-        // Check that outputs are located properly
-        assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Kt.class")
-        assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Kt.class")
-
-        result.assertSuccessful()
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Kt"))
-            checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Kt"))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("src/kt2.kt"), null, allClasses)
-            checkWhen(touch("module2/src/kt1.kt"), null, allClasses)
-        }
-    }
-
-    fun testCircularDependenciesSamePackage() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertSuccessful()
-
-        // Check that outputs are located properly
-        val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class")
-        val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class")
-        UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "<clinit>", "a", "getA")
-        UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "<clinit>", "b", "getB", "setB")
-
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage"))
-            checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage"))
-        } else {
-            val allClasses = myProject.outputPaths()
-            checkWhen(touch("module1/src/a.kt"), null, allClasses)
-            checkWhen(touch("module2/src/b.kt"), null, allClasses)
-        }
-    }
-
-    fun testCircularDependenciesSamePackageWithTests() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertSuccessful()
-
-        // Check that outputs are located properly
-        val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class")
-        val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class")
-        UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "<clinit>", "a", "funA", "getA")
-        UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "<clinit>", "b", "funB", "getB", "setB")
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage"))
-            checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage"))
-        } else {
-            val allProductionClasses = myProject.outputPaths(tests = false)
-            checkWhen(touch("module1/src/a.kt"), null, allProductionClasses)
-            checkWhen(touch("module2/src/b.kt"), null, allProductionClasses)
-        }
-    }
-
-    fun testInternalFromAnotherModule() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertFailed()
-        result.checkErrors()
-    }
-
-    fun testInternalFromSpecialRelatedModule() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-
-        val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray()
-        val clazz = URLClassLoader(classpath).loadClass("test2.BarKt")
-        clazz.getMethod("box").invoke(null)
-    }
-
-    fun testCircularDependenciesInternalFromAnotherModule() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertFailed()
-        result.checkErrors()
-    }
-
-    fun testCircularDependenciesWrongInternalFromTests() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertFailed()
-        result.checkErrors()
-    }
-
-    fun testCircularDependencyWithReferenceToOldVersionLib() {
-        initProject(JVM_MOCK_RUNTIME)
-
-        val sources = listOf(File(workDir, "oldModuleLib/src"))
-        val libraryJar = KotlinCompilerStandalone(sources).compile()
-
-        addDependency(
-            JpsJavaDependencyScope.COMPILE,
-            listOf(findModule("module1"), findModule("module2")),
-            false,
-            "module-lib",
-            libraryJar,
-        )
-
-        val result = buildAllModules()
-        result.assertSuccessful()
-    }
-
-    fun testDependencyToOldKotlinLib() {
-        initProject()
-
-        val sources = listOf(File(workDir, "oldModuleLib/src"))
-        val libraryJar = KotlinCompilerStandalone(sources).compile()
-
-        addDependency(JpsJavaDependencyScope.COMPILE, listOf(findModule("module")), false, "module-lib", libraryJar)
-
-        addKotlinStdlibDependency()
-
-        val result = buildAllModules()
-        result.assertSuccessful()
-    }
-
-    fun testDevKitProject() {
-        initProject(JVM_MOCK_RUNTIME)
-        val module = myProject.modules.single()
-        assertEquals(module.moduleType, JpsPluginModuleType.INSTANCE)
-        buildAllModules().assertSuccessful()
-        assertFilesExistInOutput(module, "TestKt.class")
-    }
-
-    fun testAccessToInternalInProductionFromTests() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertSuccessful()
-    }
-
-    private fun createKotlinJavaScriptLibraryArchive() {
-        val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR)
-        try {
-            val zip = ZipOutputStream(FileOutputStream(jarFile))
-            ZipUtil.addDirToZipRecursively(zip, jarFile, File(PATH_TO_KOTLIN_JS_LIBRARY), "", null, null)
-            zip.close()
-        } catch (ex: FileNotFoundException) {
-            throw IllegalStateException(ex.message)
-        } catch (ex: IOException) {
-            throw IllegalStateException(ex.message)
-        }
-
-    }
-
-    protected fun checkOutputFilesList(outputDir: File = productionOutputDir) {
-        if (!expectedOutputFile.exists()) {
-            expectedOutputFile.writeText("")
-            throw IllegalStateException("$expectedOutputFile did not exist. Created empty file.")
-        }
-
-        val sb = StringBuilder()
-        val p = Printer(sb, "  ")
-        outputDir.printFilesRecursively(p)
-
-        UsefulTestCase.assertSameLinesWithFile(expectedOutputFile.canonicalPath, sb.toString(), true)
-    }
-
-    private fun File.printFilesRecursively(p: Printer) {
-        val files = listFiles() ?: return
-
-        for (file in files.sortedBy { it.name }) {
-            when {
-                file.isFile -> {
-                    p.println(file.name)
-                }
-                file.isDirectory -> {
-                    p.println(file.name + "/")
-                    p.pushIndent()
-                    file.printFilesRecursively(p)
-                    p.popIndent()
-                }
-            }
-        }
-    }
-
-    private val productionOutputDir
-        get() = File(workDir, "out/production")
-
-    private fun getOutputDir(moduleName: String): File = File(productionOutputDir, moduleName)
-
-    fun testReexportedDependency() {
-        initProject()
-        addKotlinStdlibDependency(myProject.modules.filter { module -> module.name == "module2" }, true)
-        buildAllModules().assertSuccessful()
-    }
-
-    fun testCheckIsCancelledIsCalledOftenEnough() {
-        val classCount = 30
-        val methodCount = 30
-
-        fun generateFiles() {
-            val srcDir = File(workDir, "src")
-            srcDir.mkdirs()
-
-            for (i in 0..classCount) {
-                val code = buildString {
-                    appendLine("package foo")
-                    appendLine("class Foo$i {")
-                    for (j in 0..methodCount) {
-                        appendLine("  fun get${j * j}(): Int = square($j)")
-                    }
-                    appendLine("}")
-
-                }
-                File(srcDir, "Foo$i.kt").writeText(code)
-            }
-        }
-
-        generateFiles()
-        initProject(JVM_MOCK_RUNTIME)
-
-        var checkCancelledCalledCount = 0
-        val countingCancelledStatus = CanceledStatus {
-            checkCancelledCalledCount++
-            false
-        }
-
-        val logger = TestProjectBuilderLogger()
-        val buildResult = BuildResult()
-
-        buildCustom(countingCancelledStatus, logger, buildResult)
-
-        buildResult.assertSuccessful()
-        assert(checkCancelledCalledCount > classCount) {
-            "isCancelled should be called at least once per class. Expected $classCount, but got $checkCancelledCalledCount"
-        }
-    }
-
-    fun testCancelKotlinCompilation() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "foo/Bar.class")
-
-        val buildResult = BuildResult()
-        val canceledStatus = object : CanceledStatus {
-            var checkFromIndex = 0
-
-            override fun isCanceled(): Boolean {
-                val messages = buildResult.getMessages(BuildMessage.Kind.INFO)
-                for (i in checkFromIndex until messages.size) {
-                    if (messages[i].messageText.matches("kotlinc-jvm .+ \\(JRE .+\\)".toRegex())) {
-                        return true
-                    }
-                }
-
-                checkFromIndex = messages.size
-                return false
-            }
-        }
-
-        touch("src/Bar.kt").apply()
-        buildCustom(canceledStatus, TestProjectBuilderLogger(), buildResult)
-        assertCanceled(buildResult)
-    }
-
-    fun testFileDoesNotExistWarning() {
-        fun absoluteFiles(vararg paths: String): Array<File> =
-            paths.map { File(it).absoluteFile }.toTypedArray()
-
-        initProject(JVM_MOCK_RUNTIME)
-
-        val filesToBeReported = absoluteFiles("badroot.jar", "some/test.class")
-        val otherFiles = absoluteFiles("test/other/file.xml", "some/other/baddir")
-
-        addDependency(
-            JpsJavaDependencyScope.COMPILE,
-            listOf(findModule("module")),
-            false,
-            "LibraryWithBadRoots",
-            *(filesToBeReported + otherFiles),
-        )
-
-        val result = buildAllModules()
-        result.assertSuccessful()
-
-        val actualWarnings = result.getMessages(BuildMessage.Kind.WARNING).map { it.messageText }
-        val expectedWarnings = filesToBeReported.map { "Classpath entry points to a non-existent location: $it" }
-
-        val expectedText = expectedWarnings.sorted().joinToString("\n")
-        val actualText = actualWarnings.sorted().joinToString("\n")
-
-        Assert.assertEquals(expectedText, actualText)
-    }
-
-    fun testHelp() {
-        initProject()
-
-        val result = buildAllModules()
-        result.assertSuccessful()
-        val warning = result.getMessages(BuildMessage.Kind.WARNING).single()
-
-        val expectedText = StringUtil.convertLineSeparators(Usage.render(K2JVMCompiler(), K2JVMCompilerArguments()))
-        Assert.assertEquals(expectedText, warning.messageText)
-    }
-
-    fun testWrongArgument() {
-        initProject()
-
-        val result = buildAllModules()
-        result.assertFailed()
-        val errors = result.getMessages(BuildMessage.Kind.ERROR).joinToString("\n\n") { it.messageText }
-
-        Assert.assertEquals("Invalid argument: -abcdefghij-invalid-argument", errors)
-    }
-
-    fun testCodeInKotlinPackage() {
-        initProject(JVM_MOCK_RUNTIME)
-
-        val result = buildAllModules()
-        result.assertFailed()
-        val errors = result.getMessages(BuildMessage.Kind.ERROR)
-
-        Assert.assertEquals("Only the Kotlin standard library is allowed to use the 'kotlin' package", errors.single().messageText)
-    }
-
-    fun testDoNotCreateUselessKotlinIncrementalCaches() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-
-        val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot
-        assertFalse(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists())
-        assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists())
-    }
-
-    fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() {
-        initProject(JVM_MOCK_RUNTIME)
-        buildAllModules().assertSuccessful()
-
-        if (IncrementalCompilation.isEnabledForJvm()) {
-            checkWhen(touch("src/utils.kt"), null, packageClasses("kotlinProject", "src/utils.kt", "_DefaultPackage"))
-        } else {
-            val allClasses = findModule("kotlinProject").outputFilesPaths()
-            checkWhen(touch("src/utils.kt"), null, allClasses.toTypedArray())
-        }
-
-        val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot
-        assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists())
-        assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists())
-    }
-
-    fun testKotlinProjectWithEmptyProductionOutputDir() {
-        initProject(JVM_MOCK_RUNTIME)
-        val result = buildAllModules()
-        result.assertFailed()
-        result.checkErrors()
-    }
-
-    fun testKotlinProjectWithEmptyTestOutputDir() {
-        doTest()
-    }
-
-    fun testKotlinProjectWithEmptyProductionOutputDirWithoutSrcDir() {
-        doTest()
-    }
-
-    fun testKotlinProjectWithEmptyOutputDirInSomeModules() {
-        doTest()
-    }
-
-    fun testGetDependentTargets() {
-        fun addModuleWithSourceAndTestRoot(name: String): JpsModule {
-            return addModule(name, "src/").apply {
-                contentRootsList.addUrl(JpsPathUtil.pathToUrl("test/"))
-                addSourceRoot(JpsPathUtil.pathToUrl("test/"), JavaSourceRootType.TEST_SOURCE)
-            }
-        }
-
-        // c  -> b  -exported-> a
-        // c2 -> b2 ------------^
-
-        val a = addModuleWithSourceAndTestRoot("a")
-        val b = addModuleWithSourceAndTestRoot("b")
-        val c = addModuleWithSourceAndTestRoot("c")
-        val b2 = addModuleWithSourceAndTestRoot("b2")
-        val c2 = addModuleWithSourceAndTestRoot("c2")
-
-        JpsModuleRootModificationUtil.addDependency(b, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ true)
-        JpsModuleRootModificationUtil.addDependency(c, b, JpsJavaDependencyScope.COMPILE, /*exported =*/ false)
-        JpsModuleRootModificationUtil.addDependency(b2, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ false)
-        JpsModuleRootModificationUtil.addDependency(c2, b2, JpsJavaDependencyScope.COMPILE, /*exported =*/ false)
-
-        val actual = StringBuilder()
-        buildCustom(CanceledStatus.NULL, TestProjectBuilderLogger(), BuildResult()) {
-            project.setTestingContext(TestingContext(LookupTracker.DO_NOTHING, object : TestingBuildLogger {
-                override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {
-                    actual.append("Targets dependent on ${chunk.targets.joinToString()}:\n")
-                    val dependentRecursively = mutableSetOf<KotlinChunk>()
-                    context.kotlin.getChunk(chunk)!!.collectDependentChunksRecursivelyExportedOnly(dependentRecursively)
-                    dependentRecursively.asSequence().map { it.targets.joinToString() }.sorted().joinTo(actual, "\n")
-                    actual.append("\n---------\n")
-                }
-
-                override fun afterChunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {}
-                override fun invalidOrUnusedCache(
-                    chunk: KotlinChunk?,
-                    target: KotlinModuleBuildTarget<*>?,
-                    attributesDiff: CacheAttributesDiff<*>
-                ) {
-                }
-
-                override fun addCustomMessage(message: String) {}
-                override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) {}
-                override fun markedAsDirtyBeforeRound(files: Iterable<File>) {}
-                override fun markedAsDirtyAfterRound(files: Iterable<File>) {}
-            }))
-        }
-
-        val expectedFile = File(getCurrentTestDataRoot(), "expected.txt")
-
-        KotlinTestUtils.assertEqualsToFile(expectedFile, actual.toString())
-    }
-
-    fun testCustomDestination() {
-        loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr")
-        addKotlinStdlibDependency()
-        buildAllModules().apply {
-            assertSuccessful()
-
-            val aClass = File(workDir, "customOut/A.class")
-            assert(aClass.exists()) { "$aClass does not exist!" }
-
-            val warnings = getMessages(BuildMessage.Kind.WARNING)
-            assert(warnings.isEmpty()) { "Unexpected warnings: \n${warnings.joinToString("\n")}" }
-        }
-    }
-
-    private fun BuildResult.checkErrors() {
-        val actualErrors = getMessages(BuildMessage.Kind.ERROR)
-            .map { it as CompilerMessage }
-            .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n")
-        val expectedFile = File(getCurrentTestDataRoot(), "errors.txt")
-        KotlinTestUtils.assertEqualsToFile(expectedFile, actualErrors)
-    }
-
-    private fun getCurrentTestDataRoot() = File(TEST_DATA_PATH + "general/" + getTestName(false))
-
-    private fun buildCustom(
-        canceledStatus: CanceledStatus,
-        logger: TestProjectBuilderLogger,
-        buildResult: BuildResult,
-        setupProject: ProjectDescriptor.() -> Unit = {}
-    ) {
-        val scopeBuilder = CompileScopeTestBuilder.make().allModules()
-        val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger))
-
-        descriptor.setupProject()
-
-        try {
-            val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, true)
-            builder.addMessageHandler(buildResult)
-            builder.build(scopeBuilder.build(), false)
-        } finally {
-            descriptor.dataManager.flush(false)
-            descriptor.release()
-        }
-    }
-
-    private fun assertCanceled(buildResult: BuildResult) {
-        val list = buildResult.getMessages(BuildMessage.Kind.INFO)
-        assertTrue("The build has been canceled" == list.last().messageText)
-    }
-
-    private fun findModule(name: String): JpsModule {
-        for (module in myProject.modules) {
-            if (module.name == name) {
-                return module
-            }
-        }
-        throw IllegalStateException("Couldn't find module $name")
-    }
-
-    protected fun checkWhen(action: Action, pathsToCompile: Array<String>?, pathsToDelete: Array<String>?) {
-        checkWhen(arrayOf(action), pathsToCompile, pathsToDelete)
-    }
-
-    protected fun checkWhen(actions: Array<Action>, pathsToCompile: Array<String>?, pathsToDelete: Array<String>?) {
-        for (action in actions) {
-            action.apply()
-        }
-
-        buildAllModules().assertSuccessful()
-
-        if (pathsToCompile != null) {
-            assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, *pathsToCompile)
-        }
-
-        if (pathsToDelete != null) {
-            assertDeleted(*pathsToDelete)
-        }
-    }
-
-    protected fun packageClasses(moduleName: String, fileName: String, packageClassFqName: String): Array<String> {
-        return arrayOf(module(moduleName), packagePartClass(moduleName, fileName, packageClassFqName))
-    }
-
-    protected fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String {
-        val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).absolutePath)
-        val fakeVirtualFile = object : LightVirtualFile(path.substringAfterLast('/')) {
-            override fun getPath(): String {
-                // strip extra "/" from the beginning
-                return path.substring(1)
-            }
-        }
-
-        val packagePartFqName = PackagePartClassUtils.getDefaultPartFqName(FqName(packageClassFqName), fakeVirtualFile)
-        return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName))
-    }
-
-    private fun JpsProject.outputPaths(production: Boolean = true, tests: Boolean = true) =
-        modules.flatMap { it.outputFilesPaths(production = production, tests = tests) }.toTypedArray()
-
-    private fun JpsModule.outputFilesPaths(production: Boolean = true, tests: Boolean = true): List<String> {
-        val outputFiles = arrayListOf<File>()
-        if (production) {
-            prodOut.walk().filterTo(outputFiles) { it.isFile }
-        }
-        if (tests) {
-            testsOut.walk().filterTo(outputFiles) { it.isFile }
-        }
-        return outputFiles.map { FileUtilRt.toSystemIndependentName(it.relativeTo(workDir).path) }
-    }
-
-    private val JpsModule.prodOut: File
-        get() = outDir(forTests = false)
-
-    private val JpsModule.testsOut: File
-        get() = outDir(forTests = true)
-
-    private fun JpsModule.outDir(forTests: Boolean) =
-        JpsJavaExtensionService.getInstance().getOutputDirectory(this, forTests)!!
-
-    protected enum class Operation {
-        CHANGE,
-        DELETE
-    }
-
-    protected fun touch(path: String): Action = Action(Operation.CHANGE, path)
-
-    protected fun del(path: String): Action = Action(Operation.DELETE, path)
-
-    // TODO inline after KT-3974 will be fixed
-    protected fun touch(file: File): Unit = change(file.absolutePath)
-
-    protected inner class Action constructor(private val operation: Operation, private val path: String) {
-        fun apply() {
-            val file = File(workDir, path)
-            when (operation) {
-                Operation.CHANGE ->
-                    touch(file)
-                Operation.DELETE ->
-                    assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.delete())
-            }
-        }
-    }
-}
-
-private inline fun <R> withIC(enabled: Boolean = true, fn: () -> R): R {
-    val isEnabledBackup = IncrementalCompilation.isEnabledForJvm()
-    IncrementalCompilation.setIsEnabledForJvm(enabled)
-
-    try {
-        return fn()
-    } finally {
-        IncrementalCompilation.setIsEnabledForJvm(isEnabledBackup)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt
deleted file mode 100644
index 728ee72d59b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.util.ThrowableRunnable
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.config.KotlinFacetSettings
-import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import java.io.File
-import java.nio.file.Paths
-
-abstract class KotlinJpsBuildTestBase : AbstractKotlinJpsBuildTestCase() {
-    protected lateinit var originalProjectDir: File
-    protected val expectedOutputFile: File
-        get() = File(originalProjectDir, "expected-output.txt")
-
-    override fun setUp() {
-        super.setUp()
-        val currentTestMethod = this::class.members.firstOrNull { it.name == "test" + getTestName(false) }
-        val workingDirFromAnnotation = currentTestMethod?.annotations?.filterIsInstance<WorkingDir>()?.firstOrNull()?.name
-        val projDirPath = Paths.get(
-            TEST_DATA_PATH,
-            "general",
-            workingDirFromAnnotation ?: getTestName(false)
-        )
-        originalProjectDir = projDirPath.toFile()
-        workDir = copyTestDataToTmpDir(originalProjectDir)
-        orCreateProjectDir
-    }
-
-    protected open fun copyTestDataToTmpDir(testDataDir: File): File {
-        assert(testDataDir.exists()) { "Cannot find source folder " + testDataDir.absolutePath }
-        val tmpDir = FileUtil.createTempDirectory("kjbtb-jps-build", null)
-        FileUtil.copyDir(testDataDir, tmpDir)
-        return tmpDir
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable { workDir.deleteRecursively() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    override fun doGetProjectDir(): File = workDir
-
-    annotation class WorkingDir(val name: String)
-
-    enum class LibraryDependency {
-        NONE,
-        JVM_MOCK_RUNTIME,
-        JVM_FULL_RUNTIME,
-        JS_STDLIB_WITHOUT_FACET,
-        JS_STDLIB,
-    }
-
-    protected fun initProject(libraryDependency: LibraryDependency = LibraryDependency.NONE) {
-        addJdk(JDK_NAME)
-        loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr")
-
-        when (libraryDependency) {
-            LibraryDependency.NONE -> Unit
-            LibraryDependency.JVM_MOCK_RUNTIME -> addKotlinMockRuntimeDependency()
-            LibraryDependency.JVM_FULL_RUNTIME -> addKotlinStdlibDependency()
-            LibraryDependency.JS_STDLIB_WITHOUT_FACET -> addKotlinJavaScriptStdlibDependency()
-            LibraryDependency.JS_STDLIB -> {
-                addKotlinJavaScriptStdlibDependency()
-                setupKotlinJSFacet()
-            }
-        }
-    }
-
-    protected fun setupKotlinJSFacet() {
-        myProject.modules.forEach {
-            val facet = KotlinFacetSettings()
-            facet.compilerArguments = K2JSCompilerArguments()
-            facet.targetPlatform = JsPlatforms.defaultJsPlatform
-
-            it.container.setChild(
-                JpsKotlinFacetModuleExtension.KIND,
-                JpsKotlinFacetModuleExtension(facet)
-            )
-        }
-    }
-
-    companion object {
-        const val JDK_NAME = "IDEA_JDK"
-        const val PROJECT_NAME = "kotlinProject"
-
-        @JvmStatic
-        protected fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) {
-            for (path in relativePaths) {
-                val outputFile = findFileInOutputDir(module, path)
-                assertTrue(
-                    "Output not written: " + outputFile.absolutePath + "\n Directory contents: \n" + dirContents(
-                        outputFile.parentFile
-                    ), outputFile.exists()
-                )
-            }
-        }
-
-        @JvmStatic
-        protected fun findFileInOutputDir(module: JpsModule, relativePath: String): File {
-            val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false)
-            assertNotNull(outputUrl)
-            val outputDir = File(JpsPathUtil.urlToPath(outputUrl))
-            return File(outputDir, relativePath)
-        }
-
-        @JvmStatic
-        protected fun assertFilesNotExistInOutput(module: JpsModule, vararg relativePaths: String) {
-            val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false)
-            assertNotNull(outputUrl)
-            val outputDir = File(JpsPathUtil.urlToPath(outputUrl))
-            for (path in relativePaths) {
-                val outputFile = File(outputDir, path)
-                assertFalse("Output directory \"" + outputFile.absolutePath + "\" contains \"" + path + "\"", outputFile.exists())
-            }
-        }
-
-        private fun dirContents(dir: File): String {
-            val files = dir.listFiles() ?: return "<not found>"
-            val builder = StringBuilder()
-            for (file in files) {
-                builder.append(" * ").append(file.name).append("\n")
-            }
-            return builder.toString()
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt
deleted file mode 100644
index 289ef955ccc4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.util.ThrowableRunnable
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.config.LanguageVersion
-import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
-import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments
-import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments
-import java.io.File
-import kotlin.reflect.KMutableProperty1
-
-class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
-    private val enableICFixture = EnableICFixture()
-
-    override fun setUp() {
-        super.setUp()
-        enableICFixture.setUp()
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable { enableICFixture.tearDown() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    fun testKotlinJavaScriptChangePackage() {
-        initProject(LibraryDependency.JS_STDLIB)
-        buildAllModules().assertSuccessful()
-
-        val class2Kt = File(workDir, "src/Class2.kt")
-        val newClass2KtContent = class2Kt.readText().replace("package2", "package1")
-        change(class2Kt.path, newClass2KtContent)
-        buildAllModules().assertSuccessful()
-        checkOutputFilesList(File(workDir, "out/production"))
-    }
-
-    fun testJpsDaemonIC() {
-        fun testImpl() {
-            assertTrue("Daemon was not enabled!", isDaemonEnabled())
-
-            doTest()
-            val module = myProject.modules[0]
-            val mainKtClassFile = findFileInOutputDir(module, "MainKt.class")
-            assertTrue("$mainKtClassFile does not exist!", mainKtClassFile.exists())
-
-            val fooKt = File(workDir, "src/Foo.kt")
-            change(fooKt.path, null)
-            buildAllModules().assertSuccessful()
-            assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Foo.kt")
-
-            change(fooKt.path, "class Foo(val x: Int = 0)")
-            buildAllModules().assertSuccessful()
-            assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/main.kt", "src/Foo.kt")
-        }
-
-        withDaemon {
-            withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") {
-                testImpl()
-            }
-        }
-    }
-
-    fun testManyFiles() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class")
-
-        checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"))
-        checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
-        checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar")))
-
-        checkWhen(
-            del("src/main.kt"),
-            pathsToCompile = null,
-            pathsToDelete = packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")
-        )
-        assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class")
-        assertFilesNotExistInOutput(module, "foo/MainKt.class")
-
-        checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
-        checkWhen(touch("src/Bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar")))
-    }
-
-    fun testManyFilesForPackage() {
-        doTest()
-
-        val module = myProject.modules[0]
-        assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class")
-
-        checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"))
-        checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
-        checkWhen(
-            touch("src/Bar.kt"),
-            arrayOf("src/Bar.kt"),
-            arrayOf(
-                klass("kotlinProject", "foo.Bar"),
-                packagePartClass("kotlinProject", "src/Bar.kt", "foo.MainKt"),
-                module("kotlinProject")
-            )
-        )
-
-        checkWhen(
-            del("src/main.kt"),
-            pathsToCompile = null,
-            pathsToDelete = packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")
-        )
-        assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class")
-
-        checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
-        checkWhen(
-            touch("src/Bar.kt"), null,
-            arrayOf(
-                klass("kotlinProject", "foo.Bar"),
-                packagePartClass("kotlinProject", "src/Bar.kt", "foo.MainKt"),
-                module("kotlinProject")
-            )
-        )
-    }
-
-    @WorkingDir("LanguageOrApiVersionChanged")
-    fun testLanguageVersionChanged() {
-        languageOrApiVersionChanged(CommonCompilerArguments::languageVersion)
-    }
-
-    @WorkingDir("LanguageOrApiVersionChanged")
-    fun testApiVersionChanged() {
-        languageOrApiVersionChanged(CommonCompilerArguments::apiVersion)
-    }
-
-    private fun languageOrApiVersionChanged(versionProperty: KMutableProperty1<CommonCompilerArguments, String?>) {
-        initProject(LibraryDependency.JVM_MOCK_RUNTIME)
-
-        assertEquals(1, myProject.modules.size)
-        val module = myProject.modules.first()
-        val args = module.kotlinCompilerArguments
-
-        fun setVersion(newVersion: String) {
-            versionProperty.set(args, newVersion)
-            myProject.kotlinCommonCompilerArguments = args
-        }
-
-        assertNull(args.apiVersion)
-        buildAllModules().assertSuccessful()
-
-        setVersion(LanguageVersion.LATEST_STABLE.versionString)
-        buildAllModules().assertSuccessful()
-        assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME)
-
-        setVersion(LanguageVersion.KOTLIN_1_5.versionString)
-        buildAllModules().assertSuccessful()
-        assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
deleted file mode 100644
index 16a8107dda20..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/KotlinLibraries.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jps.model.java.JpsJavaLibraryType
-import org.jetbrains.jps.model.library.JpsLibrary
-import org.jetbrains.jps.model.library.JpsOrderRootType
-import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import java.io.File
-
-enum class KotlinJpsLibrary(val id: String, vararg val roots: File) {
-    @Deprecated("Use JvmStdlib instead")
-    MockRuntime(
-        "kotlin-mock-runtime",
-        KotlinArtifacts.instance.kotlinStdlib,
-        KotlinArtifacts.instance.jetbrainsAnnotations
-    ),
-
-    JvmStdLib(
-        "kotlin-stdlib",
-        KotlinArtifacts.instance.kotlinStdlib,
-        KotlinArtifacts.instance.jetbrainsAnnotations
-    ),
-    JvmTest(
-        "kotlin-test",
-        KotlinArtifacts.instance.kotlinTest
-    ),
-
-    JsStdLib(
-        "KotlinJavaScript",
-        KotlinArtifacts.instance.kotlinStdlibJs
-    ),
-    JsTest(
-        "KotlinJavaScriptTest",
-        KotlinArtifacts.instance.kotlinTestJs
-    );
-
-    fun create(project: JpsProject): JpsLibrary {
-        val library = project.addLibrary(id, JpsJavaLibraryType.INSTANCE)
-
-        for (fileRoot in roots) {
-            library.addRoot(fileRoot, JpsOrderRootType.COMPILED)
-        }
-
-        return library
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt
deleted file mode 100644
index a0a4836e1119..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.util.concurrency.FixedFuture
-import org.jetbrains.jps.builders.java.dependencyView.Callbacks
-import org.jetbrains.kotlin.incremental.isJavaFile
-import java.io.File
-import java.util.concurrent.Future
-
-/**
- * Mocks Intellij Java constant search.
- * When JPS is run from Intellij, it sends find usages request to IDE (it only searches for references inside Java files).
- *
- * We rely on heuristics instead of precise usages search.
- * A Java file is considered affected if:
- * 1. It contains changed field name as a content substring.
- * 2. Its simple file name is not equal to a field's owner class simple name (to avoid recompiling field's declaration again)
- */
-class MockJavaConstantSearch(private val workDir: File) :
-    Callbacks.ConstantAffectionResolver {
-    override fun request(
-        ownerClassName: String,
-        fieldName: String,
-        accessFlags: Int,
-        fieldRemoved: Boolean,
-        accessChanged: Boolean
-    ): Future<Callbacks.ConstantAffection> {
-        fun File.isAffected(): Boolean {
-            if (!isJavaFile()) return false
-
-            if (nameWithoutExtension == ownerClassName.substringAfterLast(".")) return false
-
-            val code = readText()
-            return code.contains(fieldName)
-        }
-
-
-        val affectedJavaFiles = workDir.walk().filter(File::isAffected).toList()
-        return FixedFuture(
-            Callbacks.ConstantAffection(
-                affectedJavaFiles
-            )
-        )
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java
deleted file mode 100644
index 64988f6efa8c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("testData/incremental/multiModule/multiplatform/withGeneratedContent")
-public abstract class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractMultiplatformJpsTestWithGeneratedContent {
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/multiplatform/withGeneratedContent/simple")
-    public static class Simple extends AbstractMultiplatformJpsTestWithGeneratedContent {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("editingPJvmJava")
-        public void testEditingPJvmJava() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/");
-        }
-
-        @TestMetadata("editingPJvmKotlin")
-        public void testEditingPJvmKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests")
-    public static class SimpleJsJvmProjectWithTests extends AbstractMultiplatformJpsTestWithGeneratedContent {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("editingCMainExpectActual")
-        public void testEditingCMainExpectActual() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/");
-        }
-
-        @TestMetadata("editingCTestsExpectActual")
-        public void testEditingCTestsExpectActual() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp")
-    public static class SimpleNewMpp extends AbstractMultiplatformJpsTestWithGeneratedContent {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("editingPJvmJava")
-        public void testEditingPJvmJava() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/");
-        }
-
-        @TestMetadata("editingPJvmKotlin")
-        public void testEditingPJvmKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate")
-    public static class Ultimate extends AbstractMultiplatformJpsTestWithGeneratedContent {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("editingACommonExpectActual")
-        public void testEditingACommonExpectActual() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/");
-        }
-
-        @TestMetadata("editingAJsClientKotlin")
-        public void testEditingAJsClientKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/");
-        }
-
-        @TestMetadata("editingAJvmClientJava")
-        public void testEditingAJvmClientJava() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/");
-        }
-
-        @TestMetadata("editingAJvmClientKotlin")
-        public void testEditingAJvmClientKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/");
-        }
-
-        @TestMetadata("editingBCommonExpectActual")
-        public void testEditingBCommonExpectActual() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/");
-        }
-
-        @TestMetadata("editingRJsKotlin")
-        public void testEditingRJsKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/");
-        }
-
-        @TestMetadata("editingRJvmKotlin")
-        public void testEditingRJvmKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/");
-        }
-
-        @TestMetadata("editingRaJsKotlin")
-        public void testEditingRaJsKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/");
-        }
-
-        @TestMetadata("editingRaJvmKotlin")
-        public void testEditingRaJvmKotlin() throws Exception {
-            runTest("testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/");
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
deleted file mode 100644
index f742b22af831..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.util.ThrowableRunnable
-import org.jetbrains.jps.builders.*
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor
-import org.jetbrains.jps.cmdline.ProjectDescriptor
-import org.jetbrains.jps.incremental.ModuleBuildTarget
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME
-import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
-import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture
-import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
-import java.io.File
-import kotlin.io.path.ExperimentalPathApi
-import kotlin.io.path.createTempDirectory
-import kotlin.reflect.KFunction1
-
-class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() {
-    private val enableICFixture = EnableICFixture()
-    private lateinit var workingDir: File
-
-    @OptIn(ExperimentalPathApi::class)
-    override fun setUp() {
-        super.setUp()
-        enableICFixture.setUp()
-        workingDir = createTempDirectory("RelocatableJpsCachesTest-" + getTestName(false)).toFile()
-    }
-
-    override fun tearDown() {
-        runAll(
-            ThrowableRunnable { workingDir.deleteRecursively() },
-            ThrowableRunnable { enableICFixture.tearDown() },
-            ThrowableRunnable { super.tearDown() }
-        )
-    }
-
-    fun testRelocatableCaches() {
-        buildTwiceAndCompare(RelocatableCacheTestCase::testRelocatableCaches)
-    }
-
-    private fun buildTwiceAndCompare(testMethod: KFunction1<RelocatableCacheTestCase, Unit>) {
-        val test1WorkingDir = workingDir.resolve("test1")
-        val test1KotlinCachesDir = workingDir.resolve("test1KotlinCaches")
-        val test2WorkingDir = workingDir.resolve("test2")
-        val test2KotlinCachesDir = workingDir.resolve("test2KotlinCaches")
-
-        runTestAndCopyKotlinCaches(test1WorkingDir, test1KotlinCachesDir, testMethod)
-        runTestAndCopyKotlinCaches(test2WorkingDir, test2KotlinCachesDir, testMethod)
-
-        assertEqualDirectories(test1KotlinCachesDir, test2KotlinCachesDir, forgiveExtraFiles = false)
-    }
-
-    private fun runTestAndCopyKotlinCaches(
-        projectWorkingDir: File,
-        dirToCopyKotlinCaches: File,
-        testMethod: KFunction1<RelocatableCacheTestCase, Unit>
-    ) {
-        val testCase = object : RelocatableCacheTestCase(
-            projectWorkingDir = projectWorkingDir,
-            dirToCopyKotlinCaches = dirToCopyKotlinCaches
-        ) {
-            override fun getName(): String = testMethod.name
-        }
-        testCase.exposedPrivateApi.setUp()
-
-        try {
-            testMethod.call(testCase)
-        } finally {
-            testCase.exposedPrivateApi.tearDown()
-        }
-    }
-}
-
-// the class should not be executed directly (hence it's abstract)
-abstract class RelocatableCacheTestCase(
-    private val projectWorkingDir: File,
-    private val dirToCopyKotlinCaches: File
-) : KotlinJpsBuildTestBase() {
-    val exposedPrivateApi = ExposedPrivateApi()
-
-    fun testRelocatableCaches() {
-        initProject(LibraryDependency.JVM_FULL_RUNTIME)
-        buildAllModules().assertSuccessful()
-
-        assertFilesExistInOutput(
-            myProject.modules.single(),
-            "MainKt.class", "Foo.class", "FooChild.class", "utils/Utils.class"
-        )
-    }
-
-    override fun copyTestDataToTmpDir(testDataDir: File): File {
-        testDataDir.copyRecursively(projectWorkingDir)
-        return projectWorkingDir
-    }
-
-    override fun doBuild(descriptor: ProjectDescriptor, scopeBuilder: CompileScopeTestBuilder?): BuildResult =
-        super.doBuild(descriptor, scopeBuilder).also {
-            copyKotlinCaches(descriptor)
-        }
-
-    private fun copyKotlinCaches(descriptor: ProjectDescriptor) {
-        val kotlinDataPaths = HashSet<File>()
-        val dataPaths = descriptor.dataManager.dataPaths
-        kotlinDataPaths.add(dataPaths.getTargetDataRoot(KotlinDataContainerTarget))
-
-        for (target in descriptor.buildTargetIndex.allTargets) {
-            if (!target.isKotlinTarget(descriptor)) continue
-
-            val targetDataRoot = descriptor.dataManager.dataPaths.getTargetDataRoot(target)
-            val kotlinDataRoot = targetDataRoot.resolve(KOTLIN_CACHE_DIRECTORY_NAME)
-            assert(kotlinDataRoot.isDirectory) { "Kotlin data root '$kotlinDataRoot' is not a directory" }
-            kotlinDataPaths.add(kotlinDataRoot)
-        }
-
-        dirToCopyKotlinCaches.deleteRecursively()
-        val originalStorageRoot = descriptor.dataManager.dataPaths.dataStorageRoot
-        for (kotlinCacheRoot in kotlinDataPaths) {
-            val relativePath = kotlinCacheRoot.relativeTo(originalStorageRoot).path
-            val targetDir = dirToCopyKotlinCaches.resolve(relativePath)
-            targetDir.parentFile.mkdirs()
-            kotlinCacheRoot.copyRecursively(targetDir)
-        }
-    }
-
-    private fun BuildTarget<*>.isKotlinTarget(descriptor: ProjectDescriptor): Boolean {
-        fun JavaSourceRootDescriptor.containsKotlinSources() = root.walk().any { it.isKotlinSourceFile }
-
-        if (this !is ModuleBuildTarget) return false
-
-        val rootDescriptors = computeRootDescriptors(
-            descriptor.model,
-            descriptor.moduleExcludeIndex,
-            descriptor.ignoredFileIndex,
-            descriptor.dataManager.dataPaths
-        )
-
-        return rootDescriptors.any { it is JavaSourceRootDescriptor && it.containsKotlinSources() }
-    }
-
-    // the famous Public Morozov pattern
-    inner class ExposedPrivateApi {
-        fun setUp() {
-            this@RelocatableCacheTestCase.setUp()
-        }
-
-        fun tearDown() {
-            this@RelocatableCacheTestCase.tearDown()
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
deleted file mode 100644
index bd1594a3619f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.util.PathUtil
-import org.jetbrains.jps.model.java.JpsJavaExtensionService
-import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-import org.jetbrains.kotlin.daemon.common.OSKind
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils
-import java.io.File
-
-class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
-    override fun setUp() {
-        super.setUp()
-        workDir = KotlinTestUtils.tmpDirForTest(this)
-    }
-
-    fun testLoadingKotlinFromDifferentModules() {
-        val aFile = createFile("m1/K.kt",
-                               """
-                                   package m1;
-
-                                   interface K {
-                                   }
-                               """)
-        createFile("m1/J.java",
-                               """
-                                   package m1;
-
-                                   public interface J {
-                                       K bar();
-                                   }
-                               """)
-        val a = addModule("m1", PathUtil.getParentPath(aFile))
-
-        val bFile = createFile("m2/m2.kt",
-                               """
-                                    import m1.J;
-                                    import m1.K;
-
-                                    interface M2: J {
-                                        override fun bar(): K
-                                    }
-                               """)
-        val b = addModule("b", PathUtil.getParentPath(bFile))
-        JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension(
-                b.dependenciesList.addModuleDependency(a)
-        ).isExported = false
-
-        addKotlinStdlibDependency()
-        rebuildAllModules()
-    }
-
-    // TODO: add JS tests
-    fun testDaemon() {
-        withDaemon {
-            withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY.property, "true") {
-                withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") {
-                    testLoadingKotlinFromDifferentModules()
-                }
-            }
-        }
-    }
-}
-
-// copied from CompilerDaemonTest.kt
-// TODO: find shared place for this function
-// java.util.Logger used in the daemon silently forgets to log into a file specified in the config on Windows,
-// if file path is given in windows form (using backslash as a separator); the reason is unknown
-// this function makes a path with forward slashed, that works on windows too
-internal val File.loggerCompatiblePath: String
-    get() =
-    if (OSKind.current == OSKind.Windows) absolutePath.replace('\\', '/')
-    else absolutePath
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
deleted file mode 100644
index 4e2bc717f210..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build.dependeciestxt
-
-import org.jetbrains.jps.model.java.JpsJavaDependencyScope
-import org.jetbrains.jps.model.module.JpsModule
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments
-import org.jetbrains.kotlin.config.CompilerSettings
-import org.jetbrains.kotlin.config.KotlinFacetSettings
-import org.jetbrains.kotlin.config.KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER
-import org.jetbrains.kotlin.config.KotlinModuleKind.SOURCE_SET_HOLDER
-import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt.Dependency.Kind.*
-import org.jetbrains.kotlin.platform.CommonPlatforms
-import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments
-import org.jetbrains.kotlin.platform.isCommon
-import org.jetbrains.kotlin.platform.js.JsPlatforms
-import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
-import org.jetbrains.kotlin.platform.jvm.isJvm
-import org.jetbrains.kotlin.platform.konan.NativePlatforms
-import java.io.File
-import kotlin.reflect.KMutableProperty1
-import kotlin.reflect.full.findAnnotation
-import kotlin.reflect.full.memberProperties
-
-/**
- * Modules description file.
- * See [README.md] for more details.
- */
-data class ModulesTxt(
-    val muted: Boolean,
-    val file: File,
-    val fileName: String,
-    val modules: List<Module>,
-    val dependencies: List<Dependency>
-) {
-    override fun toString() = fileName
-
-    data class Module(val name: String) {
-        var index: Int = -1
-
-        val indexedName
-            get() = "${index.toString().padStart(2, '0')}_$name"
-
-        /**
-         * Facet should not be created for old tests
-         */
-        var kotlinFacetSettings: KotlinFacetSettings? = null
-
-        val dependencies = mutableListOf<Dependency>()
-        val usages = mutableListOf<Dependency>()
-
-        val isCommonModule
-            get() =
-                kotlinFacetSettings?.targetPlatform.isCommon() ||
-                        kotlinFacetSettings?.kind == SOURCE_SET_HOLDER
-
-        val isJvmModule
-            get() = kotlinFacetSettings?.targetPlatform.isJvm()
-
-        val expectedBy
-            get() = dependencies.filter {
-                it.kind == EXPECTED_BY ||
-                        it.kind == INCLUDE
-            }
-
-        @Flag
-        var edit: Boolean = false
-
-        @Flag
-        var editJvm: Boolean = false
-
-        @Flag
-        var editExpectActual: Boolean = false
-
-        lateinit var jpsModule: JpsModule
-
-        companion object {
-            val flags: Map<String, KMutableProperty1<Module, Boolean>> = Module::class.memberProperties
-                .filter { it.findAnnotation<Flag>() != null }
-                .filterIsInstance<KMutableProperty1<Module, Boolean>>()
-                .associateBy { it.name }
-        }
-    }
-
-    annotation class Flag
-
-    data class Dependency(
-        val from: Module,
-        val to: Module,
-        val scope: JpsJavaDependencyScope,
-        val kind: Kind,
-        val exported: Boolean
-    ) {
-        val effectivelyExported
-            get() = kind == EXPECTED_BY || exported
-
-        init {
-            from.dependencies.add(this)
-            to.usages.add(this)
-        }
-
-        enum class Kind {
-            DEPENDENCY,
-            EXPECTED_BY,
-            INCLUDE
-        }
-    }
-}
-
-class ModulesTxtBuilder {
-    var muted = false
-
-    val modules = mutableMapOf<String, ModuleRef>()
-    private val dependencies = mutableListOf<DependencyBuilder>()
-
-    /**
-     * Reference to module which can be defined later
-     */
-    class ModuleRef(name: String) {
-        var defined: Boolean = false
-        var actual: ModulesTxt.Module = ModulesTxt.Module(name)
-
-        override fun toString() = actual.name
-
-        fun build(index: Int): ModulesTxt.Module {
-            val result = actual
-            result.index = index
-            val kotlinFacetSettings = result.kotlinFacetSettings
-            if (kotlinFacetSettings != null) {
-                kotlinFacetSettings.implementedModuleNames =
-                        result.dependencies.asSequence()
-                            .filter { it.kind == EXPECTED_BY }
-                            .map { it.to.name }
-                            .toList()
-
-                kotlinFacetSettings.sourceSetNames =
-                        result.dependencies.asSequence()
-                            .filter { it.kind == INCLUDE }
-                            .map { it.to.name }
-                            .toList()
-            }
-            return result
-        }
-    }
-
-    /**
-     * Temporary object for resolving references to modules.
-     */
-    data class DependencyBuilder(
-        val from: ModuleRef,
-        val to: ModuleRef,
-        val scope: JpsJavaDependencyScope,
-        val kind: ModulesTxt.Dependency.Kind,
-        val exported: Boolean
-    ) {
-        fun build(): ModulesTxt.Dependency {
-            when (kind) {
-                DEPENDENCY -> Unit
-                EXPECTED_BY -> check(to.actual.isCommonModule) {
-                    "$this: ${to.actual} is not common module"
-                }
-                INCLUDE -> check(to.actual.kotlinFacetSettings?.kind == SOURCE_SET_HOLDER) {
-                    "$this: ${to.actual} is not source set holder"
-                }
-            }
-            return ModulesTxt.Dependency(from.actual, to.actual, scope, kind, exported)
-        }
-    }
-
-    fun readFile(file: File, fileTitle: String = file.toString()): ModulesTxt {
-        try {
-            file.forEachLine { line ->
-                parseDeclaration(line)
-            }
-
-            // dependencies need to be build first: module.build() requires it
-            val dependencies = dependencies.map { it.build() }
-            val modules = modules.values.mapIndexed { index, moduleRef -> moduleRef.build(index) }
-
-            return ModulesTxt(muted, file, fileTitle, modules, dependencies)
-        } catch (t: Throwable) {
-            throw Error("Error while reading $file: ${t.message}", t)
-        }
-    }
-
-    private fun parseDeclaration(line: String) = doParseDeclaration(removeComments(line))
-
-    private fun removeComments(line: String) = line.split("//", limit = 2)[0].trim()
-
-    private fun doParseDeclaration(line: String) {
-        when {
-            line.isEmpty() -> Unit // skip empty lines
-            line == "MUTED" -> {
-                muted = true
-            }
-            line.contains("->") -> {
-                val (from, rest) = line.split("->", limit = 2)
-                if (rest.isBlank()) {
-                    // `name -> ` - module
-                    newModule(ValueWithFlags(from))
-                } else {
-                    val (to, flags) = parseValueWithFlags(rest.trim())
-                    newDependency(from.trim(), to.trim(), flags) // `from -> to [flag1, flag2, ...]` - dependency
-                }
-            }
-            else -> newModule(parseValueWithFlags(line)) // `name [flag1, flag2, ...]` - module
-        }
-    }
-
-    /**
-     * `value [flag1, flag2, ...]`
-     */
-    private fun parseValueWithFlags(str: String): ValueWithFlags {
-        val parts = str.split("[", limit = 2)
-        return if (parts.size > 1) {
-            val (value, flags) = parts
-            ValueWithFlags(
-                value = value.trim(),
-                flags = flags.trim()
-                    .removeSuffix("]")
-                    .split(",")
-                    .map { it.trim() }
-                    .filter { it.isNotEmpty() }
-                    .toSet()
-            )
-        } else ValueWithFlags(str)
-    }
-
-    data class ValueWithFlags(val value: String, val flags: Set<String> = setOf())
-
-    private fun moduleRef(name: String) =
-        modules.getOrPut(name) { ModuleRef(name) }
-
-    private fun newModule(def: ValueWithFlags): ModulesTxt.Module {
-        val name = def.value.trim()
-
-        val module = ModulesTxt.Module(name)
-        val settings = KotlinFacetSettings()
-        module.kotlinFacetSettings = settings
-
-        settings.useProjectSettings = false
-        settings.compilerSettings = CompilerSettings().also {
-            it.additionalArguments = "-version -Xmulti-platform"
-        }
-
-        val moduleRef = moduleRef(name)
-        check(!moduleRef.defined) { "Module `$name` already defined" }
-        moduleRef.defined = true
-        moduleRef.actual = module
-
-        def.flags.forEach { flag ->
-            when (flag) {
-                "sourceSetHolder" -> settings.kind = SOURCE_SET_HOLDER
-                "compilationAndSourceSetHolder" -> settings.kind = COMPILATION_AND_SOURCE_SET_HOLDER
-                "common" -> settings.compilerArguments =
-                    K2MetadataCompilerArguments().also { settings.targetPlatform = CommonPlatforms.defaultCommonPlatform }
-                "jvm" -> settings.compilerArguments =
-                    K2JVMCompilerArguments().also { settings.targetPlatform = JvmPlatforms.defaultJvmPlatform }
-                "js" -> settings.compilerArguments =
-                    K2JSCompilerArguments().also { settings.targetPlatform = JsPlatforms.defaultJsPlatform }
-                "native" -> settings.compilerArguments =
-                    FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.unspecifiedNativePlatform }
-                else -> {
-                    val flagProperty = ModulesTxt.Module.flags[flag]
-                    if (flagProperty != null) flagProperty.set(module, true)
-                    else error("Unknown module flag `$flag`")
-                }
-            }
-        }
-
-        return module
-    }
-
-    private fun newDependency(from: String, to: String, flags: Set<String>): DependencyBuilder? {
-        if (to.isEmpty()) {
-            // `x -> ` should just create undefined module `x`
-            moduleRef(from)
-
-            check(flags.isEmpty()) {
-                "`name -> [flag1, flag2, ...]` - not allowed due to the ambiguity of belonging to modules/dependencies. " +
-                        "Please use `x [attrs...]` syntax for module attributes."
-            }
-
-            return null
-        } else {
-            var exported = false
-            var scope: JpsJavaDependencyScope? = null
-            var kind: ModulesTxt.Dependency.Kind = DEPENDENCY
-
-            fun setScope(newScope: JpsJavaDependencyScope) {
-                check(scope == null) { "`$this: $from -> $to` dependency is already flagged as $scope" }
-                scope = newScope
-            }
-
-            fun setKind(newKind: ModulesTxt.Dependency.Kind) {
-                check(kind == DEPENDENCY) { "`$this: $from -> $to` dependency is already flagged as $kind" }
-                kind = newKind
-            }
-
-            flags.forEach { flag ->
-                when (flag) {
-                    "exported" -> exported = true
-                    "compile" -> setScope(JpsJavaDependencyScope.COMPILE)
-                    "test" -> setScope(JpsJavaDependencyScope.TEST)
-                    "runtime" -> setScope(JpsJavaDependencyScope.RUNTIME)
-                    "provided" -> setScope(JpsJavaDependencyScope.PROVIDED)
-                    "expectedBy" -> setKind(EXPECTED_BY)
-                    "include" -> setKind(INCLUDE)
-                    else -> error("Unknown dependency flag `$flag`")
-                }
-            }
-
-            return DependencyBuilder(
-                from = moduleRef(from),
-                to = moduleRef(to),
-                scope = scope ?: JpsJavaDependencyScope.COMPILE,
-                kind = kind,
-                exported = exported
-            ).also {
-                dependencies.add(it)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt
deleted file mode 100644
index 8145cb8ff40a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt
+++ /dev/null
@@ -1,438 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build.dependeciestxt
-
-import java.io.File
-
-/**
- * Utility for generating common/platform module stub contents based on it's dependencies.
- */
-fun actualizeMppJpsIncTestCaseDirs(rootDir: String, dir: String) {
-    val rootDirFile = File("$rootDir/$dir")
-    check(rootDirFile.isDirectory) { "`$rootDirFile` is not a directory" }
-
-    rootDirFile.listFiles { it: File -> it.isDirectory }.forEach { dirFile ->
-        val dependenciesTxtFile = File(dirFile, "dependencies.txt")
-        if (dependenciesTxtFile.exists()) {
-            val fileTitle = "$dir/${dirFile.name}/dependencies.txt"
-            val dependenciesTxt = ModulesTxtBuilder().readFile(dependenciesTxtFile, fileTitle)
-
-            MppJpsIncTestsGenerator(dependenciesTxt) { File(dirFile, it.name) }
-                .actualizeTestCasesDirs(dirFile)
-        }
-    }
-
-    return
-}
-
-class MppJpsIncTestsGenerator(val txt: ModulesTxt, val testCaseDirProvider: (TestCase) -> File) {
-    val ModulesTxt.Module.capitalName get() = name.capitalize()
-
-    val testCases: List<TestCase>
-
-    init {
-        val testCases = mutableListOf<TestCase>()
-
-        txt.modules.forEach {
-            if (it.edit)
-                testCases.add(EditingTestCase(it, changeJavaClass = false))
-
-            if (it.editJvm && it.isJvmModule)
-                testCases.add(EditingTestCase(it, changeJavaClass = true))
-
-            if (it.editExpectActual && it.isCommonModule)
-                testCases.add(EditingExpectActualTestCase(it))
-        }
-
-        this.testCases = testCases
-    }
-
-    fun actualizeTestCasesDirs(rootDir: File) {
-        val requiredDirs = mutableSetOf<File>()
-        testCases.forEach {
-            val dir = it.dir
-            check(requiredDirs.add(dir)) { "TestCase dir clash $dir" }
-
-            if (!dir.exists()) {
-                File(dir, "build.log").setFileContent("")
-            }
-        }
-
-        rootDir.listFiles().forEach {
-            if (it.isDirectory && it !in requiredDirs) {
-                it.deleteRecursively()
-            }
-        }
-    }
-
-    /**
-     * Set required content for [this] [File].
-     */
-    fun File.setFileContent(content: String) {
-        check(!exists()) {
-            "File `$this` already exists," +
-                    "\n\n============= contents ============\n" +
-                    readText() +
-                    "\n===================================\n" +
-                    "\n============ new content ==========\n" +
-                    content +
-                    "\n===================================\n"
-        }
-
-        parentFile.mkdirs()
-        writeText(content)
-    }
-
-    data class ModuleContentSettings(
-        val module: ModulesTxt.Module,
-        val serviceNameSuffix: String = "",
-        val generateActualDeclarationsFor: List<ModulesTxt.Module> = module.expectedBy.map { it.to },
-        val generatePlatformDependent: Boolean = true,
-        var generateKtFile: Boolean = true,
-        var generateJavaFile: Boolean = true
-    )
-
-    inner class EditingTestCase(val module: ModulesTxt.Module, val changeJavaClass: Boolean) : TestCase() {
-        override val name: String =
-            if (changeJavaClass) "editing${module.capitalName}Java"
-            else "editing${module.capitalName}Kotlin"
-
-        override val dir: File = testCaseDirProvider(this)
-
-        override fun generate() {
-            generateBaseContent()
-
-            // create new file with service implementation
-            // don't create expect/actual functions (generatePlatformDependent = false)
-            module.contentsSettings = ModuleContentSettings(
-                module,
-                serviceNameSuffix = "New",
-                generatePlatformDependent = false,
-                generateKtFile = !changeJavaClass,
-                generateJavaFile = changeJavaClass
-            )
-
-            when {
-                module.isCommonModule -> {
-                    step("create new service") {
-                        generateCommonFile(
-                            module,
-                            fileNameSuffix = ".new.$step"
-                        )
-                    }
-
-                    step("edit new service") {
-                        generateCommonFile(
-                            module,
-                            fileNameSuffix = ".touch.$step"
-                        )
-                    }
-
-                    step("delete new service") {
-                        serviceKtFile(
-                            module,
-                            fileNameSuffix = ".delete.$step"
-                        ).setFileContent("")
-                    }
-                }
-                else -> {
-                    step("create new service") {
-                        // generateKtFile event if changeJavaClass requested (for test calling java from kotlin)
-                        val prevModuleContentsSettings = module.contentsSettings
-                        module.contentsSettings = module.contentsSettings.copy(generateKtFile = true)
-
-
-                        generatePlatformFile(
-                            module,
-                            fileNameSuffix = ".new.$step"
-                        )
-
-                        module.contentsSettings = prevModuleContentsSettings
-                    }
-
-                    step("edit new service") {
-                        generatePlatformFile(
-                            module,
-                            fileNameSuffix = ".touch.$step"
-                        )
-                    }
-
-                    step("delete new service") {
-                        if (changeJavaClass) serviceJavaFile(module, fileNameSuffix = ".delete.$step").setFileContent("")
-
-                        // kotlin file also created for testing java class
-                        serviceKtFile(module, fileNameSuffix = ".delete.$step").setFileContent("")
-                    }
-                }
-            }
-
-            generateStepsTxt()
-        }
-
-    }
-
-    inner class EditingExpectActualTestCase(val commonModule: ModulesTxt.Module) : TestCase() {
-        override val name: String = "editing${commonModule.capitalName}ExpectActual"
-        override val dir: File = testCaseDirProvider(this)
-
-        override fun generate() {
-            generateBaseContent()
-            check(commonModule.isCommonModule)
-            val implModules = commonModule.usages
-                .asSequence()
-                .filter {
-                    it.kind == ModulesTxt.Dependency.Kind.EXPECTED_BY ||
-                            it.kind == ModulesTxt.Dependency.Kind.INCLUDE
-                }
-                .map { it.from }
-
-            commonModule.contentsSettings = ModuleContentSettings(commonModule, serviceNameSuffix = "New")
-            implModules.forEach { implModule ->
-                implModule.contentsSettings = ModuleContentSettings(
-                    implModule,
-                    serviceNameSuffix = "New",
-                    generateActualDeclarationsFor = listOf(commonModule)
-                )
-            }
-
-            step("create new service in ${commonModule.name}") {
-                generateCommonFile(commonModule, fileNameSuffix = ".new.$step")
-            }
-
-            implModules.forEach { implModule ->
-                step("create new service in ${implModule.name}") {
-                    generatePlatformFile(implModule, fileNameSuffix = ".new.$step")
-                }
-            }
-
-            step("change new service in ${commonModule.name}") {
-                generateCommonFile(commonModule, fileNameSuffix = ".touch.$step")
-            }
-
-            implModules.forEach { implModule ->
-                if (implModule.isJvmModule) {
-                    implModule.contentsSettings.generateKtFile = false
-                    implModule.contentsSettings.generateJavaFile = true
-                    step("change new service in ${implModule.name}: java") {
-                        generatePlatformFile(implModule, fileNameSuffix = ".touch.$step")
-                    }
-
-                    implModule.contentsSettings.generateKtFile = true
-                    implModule.contentsSettings.generateJavaFile = false
-                    step("change new service in ${implModule.name}: kotlin") {
-                        generatePlatformFile(implModule, fileNameSuffix = ".touch.$step")
-                    }
-                } else {
-                    step("change new service in ${implModule.name}") {
-                        generatePlatformFile(implModule, fileNameSuffix = ".touch.$step")
-                    }
-                }
-            }
-
-            implModules.forEach { implModule ->
-                step("delete new service in ${implModule.name}") {
-                    serviceKtFile(implModule, fileNameSuffix = ".delete.$step").setFileContent("")
-                }
-            }
-
-            step("delete new service in ${commonModule.name}") {
-                serviceKtFile(commonModule, fileNameSuffix = ".delete.$step").setFileContent("")
-            }
-
-            generateStepsTxt()
-        }
-    }
-
-    abstract inner class TestCase() {
-        abstract val name: String
-
-        abstract fun generate()
-
-        abstract val dir: File
-
-        private val modules = mutableMapOf<ModulesTxt.Module, ModuleContentSettings>()
-
-        var step = 1
-        val steps = mutableListOf<String>()
-
-        protected inline fun step(name: String, body: () -> Unit) {
-            body()
-            steps.add(name)
-            step++
-        }
-
-        var ModulesTxt.Module.contentsSettings: ModuleContentSettings
-            get() = modules.getOrPut(this) { ModuleContentSettings(this) }
-            set(value) {
-                modules[this] = value
-            }
-
-        protected fun generateStepsTxt() {
-            File(dir, "_steps.txt").setFileContent(steps.joinToString("\n"))
-        }
-
-        fun generateBaseContent() {
-            dir.mkdir()
-
-            txt.modules.forEach {
-                generateModuleContents(it)
-            }
-        }
-
-        private fun generateModuleContents(module: ModulesTxt.Module) {
-            when {
-                module.isCommonModule -> {
-                    // common module
-                    generateCommonFile(module)
-                }
-                module.expectedBy.isEmpty() -> {
-                    // regular module
-                    generatePlatformFile(module)
-                }
-                else -> {
-                    // common module platform implementation
-                    generatePlatformFile(module)
-                }
-            }
-        }
-
-        private val ModulesTxt.Module.serviceName
-            get() = "$capitalName${contentsSettings.serviceNameSuffix}"
-
-        private val ModulesTxt.Module.javaClassName
-            get() = "${serviceName}JavaClass"
-
-        protected fun serviceKtFile(module: ModulesTxt.Module, fileNameSuffix: String = ""): File {
-            val suffix =
-                if (module.isCommonModule) "${module.serviceName}Header"
-                else "${module.name.capitalize()}${module.contentsSettings.serviceNameSuffix}Impl"
-
-            return File(dir, "${module.indexedName}_service$suffix.kt$fileNameSuffix")
-        }
-
-        fun serviceJavaFile(module: ModulesTxt.Module, fileNameSuffix: String = ""): File {
-            return File(dir, "${module.indexedName}_${module.javaClassName}.java$fileNameSuffix")
-        }
-
-        private val ModulesTxt.Module.platformDependentFunName: String
-            get() {
-                check(isCommonModule)
-                return "${name}_platformDependent$serviceName"
-            }
-
-        private val ModulesTxt.Module.platformIndependentFunName: String
-            get() {
-                check(isCommonModule)
-                return "${name}_platformIndependent$serviceName"
-            }
-
-        private val ModulesTxt.Module.platformOnlyFunName: String
-            get() {
-                // platformOnly fun names already unique, so no module name prefix required
-                return "${name}_platformOnly${contentsSettings.serviceNameSuffix}"
-            }
-
-        protected fun generateCommonFile(
-            module: ModulesTxt.Module,
-            fileNameSuffix: String = ""
-        ) {
-            val settings = module.contentsSettings
-
-            serviceKtFile(module, fileNameSuffix).setFileContent(buildString {
-                if (settings.generatePlatformDependent)
-                    appendLine("expect fun ${module.platformDependentFunName}(): String")
-
-                appendLine("fun ${module.platformIndependentFunName}() = \"common$fileNameSuffix\"")
-
-                appendTestFun(module, settings)
-            })
-        }
-
-        protected fun generatePlatformFile(
-            module: ModulesTxt.Module,
-            fileNameSuffix: String = ""
-        ) {
-            val isJvm = module.isJvmModule
-            val settings = module.contentsSettings
-
-            val javaClassName = module.javaClassName
-
-            if (settings.generateKtFile) {
-                serviceKtFile(module, fileNameSuffix).setFileContent(buildString {
-                    if (settings.generatePlatformDependent) {
-                        for (expectedBy in settings.generateActualDeclarationsFor) {
-                            appendLine(
-                                "actual fun ${expectedBy.platformDependentFunName}(): String" +
-                                        " = \"${module.name}$fileNameSuffix\""
-                            )
-                        }
-                    }
-
-                    appendLine(
-                        "fun ${module.platformOnlyFunName}()" +
-                                " = \"${module.name}$fileNameSuffix\""
-                    )
-
-                    appendTestFun(module, settings)
-                })
-            }
-
-            if (isJvm && settings.generateJavaFile) {
-                serviceJavaFile(module, fileNameSuffix).setFileContent(
-                    """
-                    |public class $javaClassName {
-                    |    public String doStuff() {
-                    |       return "${module.name}$fileNameSuffix";
-                    |    }
-                    |}
-                    """.trimMargin()
-                )
-            }
-        }
-
-        // call all functions declared in this module and all of its dependencies recursively
-        private fun StringBuilder.appendTestFun(
-            module: ModulesTxt.Module,
-            settings: ModuleContentSettings
-        ) {
-            appendLine()
-            appendLine("fun Test${module.serviceName}() {")
-
-            val thisAndDependencies = mutableSetOf(module)
-            module.collectDependenciesRecursivelyTo(thisAndDependencies)
-            thisAndDependencies.forEach { thisOrDependent ->
-                if (thisOrDependent.isCommonModule) {
-                    appendLine("  ${thisOrDependent.platformIndependentFunName}()")
-
-                    if (settings.generatePlatformDependent) {
-                        appendLine("  ${thisOrDependent.platformDependentFunName}()")
-                    }
-                } else {
-                    // platform module
-                    appendLine("  ${thisOrDependent.platformOnlyFunName}()")
-
-                    if (thisOrDependent.isJvmModule && thisOrDependent.contentsSettings.generateJavaFile) {
-                        appendLine("  ${thisOrDependent.javaClassName}().doStuff()")
-                    }
-                }
-            }
-
-            appendLine("}")
-        }
-
-        private fun ModulesTxt.Module.collectDependenciesRecursivelyTo(
-            collection: MutableCollection<ModulesTxt.Module>,
-            exportedOnly: Boolean = false
-        ) {
-            dependencies.forEach {
-                if (!exportedOnly || it.effectivelyExported) {
-                    val dependentModule = it.to
-                    collection.add(dependentModule)
-                    dependentModule.collectDependenciesRecursivelyTo(collection, exportedOnly = true)
-                }
-            }
-        }
-
-        override fun toString() = name
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md
deleted file mode 100644
index 83a2c9816ead..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/PACKAGE.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Useful micro-language for concise description of project structure.
-Mostly like the [DOT language](https://www.graphviz.org/doc/info/attrs.html).
-
-## Example
-
-```
-c [common]
-p1 [jvm]
-p2 [jvm]
-
-p1 -> c [expectedBy]
-p2 -> c [expectedBy]
-```
-
-## Format
-
-File contains declarations of modules and dependencies:
-  - Module: `module_name [flag1, key1=value1, ...]`
-  - Dependency: `source_module_name -> target_module_name [flag1, key1=value1, ...]`
-  
-Referring to undefined module is allowed (`jvm` module will be created at this case).
-This modules can be defined after reference. Several declarations for same module is not allowed.
-
-Supported module flags:
-  - `common` (old MPP)
-  - `sourceSetHolder`, `compilationAndSourceSetHolder` (new MPP)
-  - `jvm` (default)
-  - `js`
-  - `edit`, `editJvm`, `editExcpetActual` - see jps-plugin/tests/testData/incremental/multiplatform/multiModule/README.md
-    
-Supported dependency flags:
-  - `compile` (default)
-  - `test`
-  - `runtime`
-  - `provided`
-  - `expectedBy` (old MPP)
-  - `included` (new MPP)
-  - `exproted`
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/fixtures/EnableICFixture.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/fixtures/EnableICFixture.kt
deleted file mode 100644
index 493c3d8afae0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/fixtures/EnableICFixture.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build.fixtures
-
-import org.jetbrains.kotlin.config.IncrementalCompilation
-
-class EnableICFixture(
-    private val enableJvmIC: Boolean = true,
-    private val enableJsIC: Boolean = true
-) {
-    private var isICEnabledBackup: Boolean = false
-    private var isICEnabledForJsBackup: Boolean = false
-
-    fun setUp() {
-        isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
-        IncrementalCompilation.setIsEnabledForJvm(enableJvmIC)
-
-        isICEnabledForJsBackup = IncrementalCompilation.isEnabledForJs()
-        IncrementalCompilation.setIsEnabledForJs(enableJsIC)
-    }
-
-    fun tearDown() {
-        IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
-        IncrementalCompilation.setIsEnabledForJs(isICEnabledForJsBackup)
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt
deleted file mode 100644
index dd2d86dc42c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.build
-
-import com.intellij.openapi.util.io.FileUtil
-import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
-import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner
-
-inline fun withSystemProperty(property: String, newValue: String?, fn: ()->Unit) {
-    val backup = System.getProperty(property)
-    setOrClearSysProperty(property, newValue)
-
-    try {
-        fn()
-    }
-    finally {
-        setOrClearSysProperty(property, backup)
-    }
-}
-
-
-@Suppress("NOTHING_TO_INLINE")
-inline fun setOrClearSysProperty(property: String, newValue: String?) {
-    if (newValue != null) {
-        System.setProperty(property, newValue)
-    }
-    else {
-        System.clearProperty(property)
-    }
-}
-
-fun withDaemon(fn: () -> Unit) {
-    val daemonHome = FileUtil.createTempDirectory("daemon-home", "testJpsDaemonIC")
-
-    withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS.property, daemonHome.absolutePath) {
-        withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_ENABLED_PROPERTY.property, "true") {
-            try {
-                fn()
-            } finally {
-                JpsKotlinCompilerRunner.shutdownDaemon()
-
-                // Try to force directory deletion to prevent test failure later in tearDown().
-                // Working Daemon can prevent folder deletion on Windows, because Daemon shutdown
-                // is asynchronous.
-                var attempts = 0
-                daemonHome.deleteRecursively()
-                while (daemonHome.exists() && attempts < 100) {
-                    daemonHome.deleteRecursively()
-                    attempts++
-                    Thread.sleep(50)
-                }
-
-                if (daemonHome.exists()) {
-                    error("Couldn't delete Daemon home directory")
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
deleted file mode 100644
index 7522f7614ec2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants
-import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.incremental.ProtoData
-import org.jetbrains.kotlin.incremental.getProtoData
-import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
-import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
-import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
-import org.jetbrains.kotlin.name.ClassId
-import org.junit.Assert
-import java.io.File
-
-abstract class AbstractJsProtoComparisonTest : AbstractProtoComparisonTest<ProtoData>() {
-    override fun expectedOutputFile(testDir: File): File =
-        File(testDir, "result-js.out")
-                .takeIf { it.exists() }
-                ?: super.expectedOutputFile(testDir)
-
-    override fun compileAndGetClasses(sourceDir: File, outputDir: File): Map<ClassId, ProtoData> {
-        val incrementalResults = IncrementalResultsConsumerImpl()
-        val services = Services.Builder().run {
-            register(IncrementalResultsConsumer::class.java, incrementalResults)
-            build()
-        }
-
-        val ktFiles = sourceDir.walkMatching { it.name.endsWith(".kt") }.map { it.canonicalPath }.toList()
-        val messageCollector = TestMessageCollector()
-        val outputItemsCollector = OutputItemsCollectorImpl()
-        val args = K2JSCompilerArguments().apply {
-            outputFile = File(outputDir, "out.js").canonicalPath
-            metaInfo = true
-            main = K2JsArgumentConstants.NO_CALL
-            freeArgs = ktFiles
-        }
-
-        val env = createTestingCompilerEnvironment(messageCollector, outputItemsCollector, services)
-        runJSCompiler(args, env).let { exitCode ->
-            val expectedOutput = "OK"
-            val actualOutput = (listOf(exitCode?.name) + messageCollector.errors).joinToString("\n")
-            Assert.assertEquals(expectedOutput, actualOutput)
-        }
-
-        val classes = hashMapOf<ClassId, ProtoData>()
-
-        for ((sourceFile, translationResult) in incrementalResults.packageParts) {
-            classes.putAll(getProtoData(sourceFile, translationResult.metadata))
-        }
-
-        return classes
-    }
-
-    override fun ProtoData.toProtoData(): ProtoData? = this
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt
deleted file mode 100644
index 4bd5327d3b6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJvmProtoComparisonTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
-import org.jetbrains.kotlin.incremental.ProtoData
-import org.jetbrains.kotlin.incremental.storage.ProtoMapValue
-import org.jetbrains.kotlin.incremental.toProtoData
-import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
-import org.jetbrains.kotlin.metadata.jvm.deserialization.BitEncoding
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.idea.test.KotlinCompilerStandalone
-import java.io.File
-
-abstract class AbstractJvmProtoComparisonTest : AbstractProtoComparisonTest<LocalFileKotlinClass>() {
-    override fun compileAndGetClasses(sourceDir: File, outputDir: File): Map<ClassId, LocalFileKotlinClass> {
-        val extraOptions = listOf("-Xdisable-default-scripting-plugin")
-        KotlinCompilerStandalone(listOf(sourceDir), target = outputDir, options = extraOptions).compile()
-
-        val classFiles = outputDir.walkMatching { it.name.endsWith(".class") }
-        val localClassFiles = classFiles.map { LocalFileKotlinClass.create(it)!! }
-        return localClassFiles.associateBy { it.classId }
-    }
-
-    override fun LocalFileKotlinClass.toProtoData(): ProtoData? {
-        assert(classHeader.metadataVersion.isCompatible()) { "Incompatible class ($classHeader): $location" }
-
-        val bytes by lazy { BitEncoding.decodeBytes(classHeader.data!!) }
-        val strings by lazy { classHeader.strings!! }
-        val packageFqName = classId.packageFqName
-
-        return when (classHeader.kind) {
-            KotlinClassHeader.Kind.CLASS -> {
-                ProtoMapValue(false, bytes, strings).toProtoData(packageFqName)
-            }
-            KotlinClassHeader.Kind.FILE_FACADE,
-            KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> {
-                ProtoMapValue(true, bytes, strings).toProtoData(packageFqName)
-            }
-            else -> {
-                null
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
deleted file mode 100644
index 178db474dfcf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.kotlin.TestWithWorkingDir
-import org.jetbrains.kotlin.incremental.*
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils
-import org.jetbrains.kotlin.utils.Printer
-import java.io.File
-
-abstract class AbstractProtoComparisonTest<PROTO_DATA> : TestWithWorkingDir() {
-    protected abstract fun compileAndGetClasses(sourceDir: File, outputDir: File): Map<ClassId, PROTO_DATA>
-    protected abstract fun PROTO_DATA.toProtoData(): ProtoData?
-
-    protected open fun expectedOutputFile(testDir: File): File =
-        File(testDir, "result.out")
-
-    fun doTest(testDataPath: String) {
-        val testDir = File(testDataPath)
-
-        val oldClassMap = classesForPrefixedSources(testDir, workingDir, "old")
-        val newClassMap = classesForPrefixedSources(testDir, workingDir, "new")
-
-        val sb = StringBuilder()
-        val p = Printer(sb)
-
-        (oldClassMap.keys - newClassMap.keys).sortedBy { it.toString() }.forEach { classId ->
-            p.println("REMOVED $classId")
-        }
-
-        (newClassMap.keys - oldClassMap.keys).sortedBy { it.toString() }.forEach { classId ->
-            p.println("ADDED $classId")
-        }
-
-        (oldClassMap.keys.intersect(newClassMap.keys)).sortedBy { it.toString() }.forEach { classId ->
-            val oldData = oldClassMap[classId]!!.toProtoData()
-            val newData = newClassMap[classId]!!.toProtoData()
-
-            if (oldData == null || newData == null) {
-                p.println("SKIPPED $classId")
-                return@forEach
-            }
-
-            val rawProtoDifference = when {
-                oldData is ClassProtoData && newData is ClassProtoData -> {
-                    ProtoCompareGenerated(
-                        oldNameResolver = oldData.nameResolver,
-                        newNameResolver = newData.nameResolver,
-                        oldTypeTable = oldData.proto.typeTableOrNull,
-                        newTypeTable = newData.proto.typeTableOrNull
-                    ).difference(oldData.proto, newData.proto)
-                }
-                oldData is PackagePartProtoData && newData is PackagePartProtoData -> {
-                    ProtoCompareGenerated(
-                        oldNameResolver = oldData.nameResolver,
-                        newNameResolver = newData.nameResolver,
-                        oldTypeTable = oldData.proto.typeTableOrNull,
-                        newTypeTable = newData.proto.typeTableOrNull
-                    ).difference(oldData.proto, newData.proto)
-                }
-                else -> null
-            }
-            rawProtoDifference?.let {
-                if (it.isNotEmpty()) {
-                    p.println("PROTO DIFFERENCE in $classId: ${it.sortedBy { it.name }.joinToString()}")
-                }
-            }
-
-            val changesInfo = ChangesCollector().apply { collectProtoChanges(oldData, newData) }.changes()
-            if (changesInfo.isEmpty()) {
-                return@forEach
-            }
-
-            val changes = changesInfo.map {
-                when (it) {
-                    is ChangeInfo.SignatureChanged -> "CLASS_SIGNATURE"
-                    is ChangeInfo.MembersChanged -> "MEMBERS\n    ${it.names.sorted()}"
-                    is ChangeInfo.ParentsChanged -> "PARENTS\n    ${it.parentsChanged.map { it.asString()}.sorted()}"
-
-                }
-            }.sorted()
-
-            p.println("CHANGES in $classId: ${changes.joinToString()}")
-        }
-
-        KotlinTestUtils.assertEqualsToFile(expectedOutputFile(testDir), sb.toString())
-    }
-
-    private fun classesForPrefixedSources(testDir: File, workingDir: File, prefix: String): Map<ClassId, PROTO_DATA> {
-        val srcDir = workingDir.createSubDirectory("$prefix/src")
-        val outDir = workingDir.createSubDirectory("$prefix/out")
-        copySourceFiles(testDir, srcDir, prefix)
-        return compileAndGetClasses(srcDir, outDir)
-    }
-
-    private fun copySourceFiles(sourceDir: File, targetDir: File, prefix: String) {
-        for (srcFile in sourceDir.walkMatching { it.name.startsWith(prefix) }) {
-            val targetFile = File(targetDir, srcFile.name.replaceFirst(prefix, "main"))
-            srcFile.copyTo(targetFile)
-        }
-    }
-
-    protected fun File.createSubDirectory(relativePath: String): File =
-            File(this, relativePath).apply { mkdirs() }
-
-    protected fun File.walkMatching(predicate: (File)->Boolean): Sequence<File> =
-            walk().filter { predicate(it) }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt
deleted file mode 100644
index aca2ed1c1c21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-class CacheVersionTest {
-    @Test
-    fun testConstruct() {
-        assertEquals(
-            3011001,
-            CacheVersion(
-                3,
-                JvmBytecodeBinaryVersion(1, 0, 3),
-                JvmMetadataVersion(1, 1, 13)
-            ).intValue
-        )
-    }
-
-    @Test
-    fun testDeconstruct() {
-        assertEquals(
-            "CacheVersion(caches: 3, bytecode: 1.0, metadata: 1.1)",
-            CacheVersion(3011001).toString()
-        )
-    }
-
-    @Test
-    fun testConstructDeconstruct() {
-        val version = CacheVersion(
-            1,
-            JvmBytecodeBinaryVersion(2, 3),
-            JvmMetadataVersion(4, 5)
-        )
-
-        assertEquals(1024305, version.intValue)
-        assertEquals("CacheVersion(caches: 1, bytecode: 2.3, metadata: 4.5)", version.toString())
-    }
-
-    @Test
-    fun testMaxValues() {
-        assertEquals(
-            "CacheVersion(caches: 2146, bytecode: 9.9, metadata: 9.99)",
-            CacheVersion(
-                2146,
-                JvmBytecodeBinaryVersion(9, 9),
-                JvmMetadataVersion(9, 99)
-            ).toString()
-        )
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt
deleted file mode 100644
index c0d7f556c75a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/CompositeLookupsCacheAttributesManagerTest.kt
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.junit.Test
-import kotlin.io.path.Path
-import kotlin.test.assertEquals
-
-class CompositeLookupsCacheAttributesManagerTest {
-    val manager = CompositeLookupsCacheAttributesManager(Path("not-used"), setOf())
-
-    @Test
-    fun testNothingToJava() {
-        assertEquals(
-            CacheStatus.INVALID,
-            manager.loadDiff(
-                actual = null,
-                expected = CompositeLookupsCacheAttributes(1, setOf("jvm"))
-            ).status
-        )
-    }
-
-    @Test
-    fun testNothingToJavaAndJs() {
-        assertEquals(
-            CacheStatus.INVALID,
-            manager.loadDiff(
-                actual = null,
-                expected = CompositeLookupsCacheAttributes(1, setOf("jvm", "js"))
-            ).status
-        )
-    }
-
-    @Test
-    fun testJsToJava() {
-        assertEquals(
-            CacheStatus.INVALID,
-            manager.loadDiff(
-                actual = CompositeLookupsCacheAttributes(1, setOf("jvm")),
-                expected = CompositeLookupsCacheAttributes(1, setOf("js"))
-            ).status
-        )
-    }
-
-    @Test
-    fun testJsAndJavaToJava() {
-        assertEquals(
-            CacheStatus.VALID,
-            manager.loadDiff(
-                actual = CompositeLookupsCacheAttributes(1, setOf("jvm", "js")),
-                expected = CompositeLookupsCacheAttributes(1, setOf("jvm"))
-            ).status
-        )
-    }
-
-    @Test
-    fun testJsAndJavaToJavaWithOtherVersion() {
-        assertEquals(
-            CacheStatus.INVALID,
-            manager.loadDiff(
-                actual = CompositeLookupsCacheAttributes(1, setOf("jvm", "js")),
-                expected = CompositeLookupsCacheAttributes(2, setOf("jvm"))
-            ).status
-        )
-    }
-
-    @Test
-    fun testJavaToJsAndJava() {
-        assertEquals(
-            CacheStatus.INVALID,
-            manager.loadDiff(
-                actual = CompositeLookupsCacheAttributes(1, setOf("jvm")),
-                expected = CompositeLookupsCacheAttributes(1, setOf("jvm", "js"))
-            ).status
-        )
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java
deleted file mode 100644
index 3e1ebf1ce6bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public abstract class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTest {
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classSignatureChange")
-    public static class ClassSignatureChange extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classAnnotationListChanged")
-        public void testClassAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classAnnotationListChanged/");
-        }
-
-        @TestMetadata("classFlagsAndMembersChanged")
-        public void testClassFlagsAndMembersChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
-        }
-
-        @TestMetadata("classFlagsChanged")
-        public void testClassFlagsChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classFlagsChanged/");
-        }
-
-        @TestMetadata("classTypeParameterListChanged")
-        public void testClassTypeParameterListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classTypeParameterListChanged/");
-        }
-
-        @TestMetadata("classWithSuperTypeListChanged")
-        public void testClassWithSuperTypeListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
-        }
-
-        @TestMetadata("nestedClassSignatureChanged")
-        public void testNestedClassSignatureChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
-        }
-
-        @TestMetadata("sealedClassImplAdded")
-        public void testSealedClassImplAdded() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassImplAdded/");
-        }
-
-        @TestMetadata("sealedClassImplRemoved")
-        public void testSealedClassImplRemoved() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassImplRemoved/");
-        }
-
-        @TestMetadata("sealedClassNestedImplAdded")
-        public void testSealedClassNestedImplAdded() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
-        }
-
-        @TestMetadata("sealedClassNestedImplAddedDeep")
-        public void testSealedClassNestedImplAddedDeep() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
-        }
-
-        @TestMetadata("sealedClassNestedImplRemoved")
-        public void testSealedClassNestedImplRemoved() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classPrivateOnlyChange")
-    public static class ClassPrivateOnlyChange extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classWithPrivateFunChanged")
-        public void testClassWithPrivateFunChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
-        }
-
-        @TestMetadata("classWithPrivatePrimaryConstructorChanged")
-        public void testClassWithPrivatePrimaryConstructorChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
-        }
-
-        @TestMetadata("classWithPrivateSecondaryConstructorChanged")
-        public void testClassWithPrivateSecondaryConstructorChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
-        }
-
-        @TestMetadata("classWithPrivateValChanged")
-        public void testClassWithPrivateValChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
-        }
-
-        @TestMetadata("classWithPrivateVarChanged")
-        public void testClassWithPrivateVarChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classMembersOnlyChanged")
-    public static class ClassMembersOnlyChanged extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classWithCompanionObjectChanged")
-        public void testClassWithCompanionObjectChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
-        }
-
-        @TestMetadata("classWithConstructorChanged")
-        public void testClassWithConstructorChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
-        }
-
-        @TestMetadata("classWithFunAndValChanged")
-        public void testClassWithFunAndValChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
-        }
-
-        @TestMetadata("classWithNestedClassesChanged")
-        public void testClassWithNestedClassesChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
-        }
-
-        @TestMetadata("classWitnEnumChanged")
-        public void testClassWitnEnumChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
-        }
-
-        @TestMetadata("defaultValues")
-        public void testDefaultValues() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/defaultValues/");
-        }
-
-        @TestMetadata("membersAnnotationListChanged")
-        public void testMembersAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
-        }
-
-        @TestMetadata("membersFlagsChanged")
-        public void testMembersFlagsChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
-        }
-
-        @TestMetadata("nestedClassMembersChanged")
-        public void testNestedClassMembersChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
-        }
-
-        @TestMetadata("sealedClassImplAdded")
-        public void testSealedClassImplAdded() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/packageMembers")
-    public static class PackageMembers extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("defaultValues")
-        public void testDefaultValues() throws Exception {
-            runTest("testData/comparison/packageMembers/defaultValues/");
-        }
-
-        @TestMetadata("membersAnnotationListChanged")
-        public void testMembersAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/packageMembers/membersAnnotationListChanged/");
-        }
-
-        @TestMetadata("membersFlagsChanged")
-        public void testMembersFlagsChanged() throws Exception {
-            runTest("testData/comparison/packageMembers/membersFlagsChanged/");
-        }
-
-        @TestMetadata("packageFacadePrivateOnlyChanges")
-        public void testPackageFacadePrivateOnlyChanges() throws Exception {
-            runTest("testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
-        }
-
-        @TestMetadata("packageFacadePublicChanges")
-        public void testPackageFacadePublicChanges() throws Exception {
-            runTest("testData/comparison/packageMembers/packageFacadePublicChanges/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/unchanged")
-    public static class Unchanged extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("unchangedClass")
-        public void testUnchangedClass() throws Exception {
-            runTest("testData/comparison/unchanged/unchangedClass/");
-        }
-
-        @TestMetadata("unchangedPackageFacade")
-        public void testUnchangedPackageFacade() throws Exception {
-            runTest("testData/comparison/unchanged/unchangedPackageFacade/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/jsOnly")
-    public static class JsOnly extends AbstractJsProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("externals")
-        public void testExternals() throws Exception {
-            runTest("testData/comparison/jsOnly/externals/");
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java
deleted file mode 100644
index b2a5e32b840d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.jetbrains.kotlin.idea.test.TestRoot;
-import org.junit.runner.RunWith;
-
-/**
- * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
- * DO NOT MODIFY MANUALLY.
- */
-@SuppressWarnings("all")
-@TestRoot("jps/jps-plugin/tests")
-@TestDataPath("$CONTENT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public abstract class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonTest {
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classSignatureChange")
-    public static class ClassSignatureChange extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classAnnotationListChanged")
-        public void testClassAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classAnnotationListChanged/");
-        }
-
-        @TestMetadata("classFlagsAndMembersChanged")
-        public void testClassFlagsAndMembersChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classFlagsAndMembersChanged/");
-        }
-
-        @TestMetadata("classFlagsChanged")
-        public void testClassFlagsChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classFlagsChanged/");
-        }
-
-        @TestMetadata("classTypeParameterListChanged")
-        public void testClassTypeParameterListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classTypeParameterListChanged/");
-        }
-
-        @TestMetadata("classWithSuperTypeListChanged")
-        public void testClassWithSuperTypeListChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/classWithSuperTypeListChanged/");
-        }
-
-        @TestMetadata("nestedClassSignatureChanged")
-        public void testNestedClassSignatureChanged() throws Exception {
-            runTest("testData/comparison/classSignatureChange/nestedClassSignatureChanged/");
-        }
-
-        @TestMetadata("sealedClassImplAdded")
-        public void testSealedClassImplAdded() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassImplAdded/");
-        }
-
-        @TestMetadata("sealedClassImplRemoved")
-        public void testSealedClassImplRemoved() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassImplRemoved/");
-        }
-
-        @TestMetadata("sealedClassNestedImplAdded")
-        public void testSealedClassNestedImplAdded() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplAdded/");
-        }
-
-        @TestMetadata("sealedClassNestedImplAddedDeep")
-        public void testSealedClassNestedImplAddedDeep() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/");
-        }
-
-        @TestMetadata("sealedClassNestedImplRemoved")
-        public void testSealedClassNestedImplRemoved() throws Exception {
-            runTest("testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classPrivateOnlyChange")
-    public static class ClassPrivateOnlyChange extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classWithPrivateFunChanged")
-        public void testClassWithPrivateFunChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/");
-        }
-
-        @TestMetadata("classWithPrivatePrimaryConstructorChanged")
-        public void testClassWithPrivatePrimaryConstructorChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/");
-        }
-
-        @TestMetadata("classWithPrivateSecondaryConstructorChanged")
-        public void testClassWithPrivateSecondaryConstructorChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/");
-        }
-
-        @TestMetadata("classWithPrivateValChanged")
-        public void testClassWithPrivateValChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/");
-        }
-
-        @TestMetadata("classWithPrivateVarChanged")
-        public void testClassWithPrivateVarChanged() throws Exception {
-            runTest("testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/classMembersOnlyChanged")
-    public static class ClassMembersOnlyChanged extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classWithCompanionObjectChanged")
-        public void testClassWithCompanionObjectChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/");
-        }
-
-        @TestMetadata("classWithConstructorChanged")
-        public void testClassWithConstructorChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/");
-        }
-
-        @TestMetadata("classWithFunAndValChanged")
-        public void testClassWithFunAndValChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/");
-        }
-
-        @TestMetadata("classWithNestedClassesChanged")
-        public void testClassWithNestedClassesChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/");
-        }
-
-        @TestMetadata("classWitnEnumChanged")
-        public void testClassWitnEnumChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/");
-        }
-
-        @TestMetadata("defaultValues")
-        public void testDefaultValues() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/defaultValues/");
-        }
-
-        @TestMetadata("membersAnnotationListChanged")
-        public void testMembersAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/");
-        }
-
-        @TestMetadata("membersFlagsChanged")
-        public void testMembersFlagsChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/membersFlagsChanged/");
-        }
-
-        @TestMetadata("nestedClassMembersChanged")
-        public void testNestedClassMembersChanged() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/");
-        }
-
-        @TestMetadata("sealedClassImplAdded")
-        public void testSealedClassImplAdded() throws Exception {
-            runTest("testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/packageMembers")
-    public static class PackageMembers extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("defaultValues")
-        public void testDefaultValues() throws Exception {
-            runTest("testData/comparison/packageMembers/defaultValues/");
-        }
-
-        @TestMetadata("membersAnnotationListChanged")
-        public void testMembersAnnotationListChanged() throws Exception {
-            runTest("testData/comparison/packageMembers/membersAnnotationListChanged/");
-        }
-
-        @TestMetadata("membersFlagsChanged")
-        public void testMembersFlagsChanged() throws Exception {
-            runTest("testData/comparison/packageMembers/membersFlagsChanged/");
-        }
-
-        @TestMetadata("packageFacadePrivateOnlyChanges")
-        public void testPackageFacadePrivateOnlyChanges() throws Exception {
-            runTest("testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/");
-        }
-
-        @TestMetadata("packageFacadePublicChanges")
-        public void testPackageFacadePublicChanges() throws Exception {
-            runTest("testData/comparison/packageMembers/packageFacadePublicChanges/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/unchanged")
-    public static class Unchanged extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("unchangedClass")
-        public void testUnchangedClass() throws Exception {
-            runTest("testData/comparison/unchanged/unchangedClass/");
-        }
-
-        @TestMetadata("unchangedPackageFacade")
-        public void testUnchangedPackageFacade() throws Exception {
-            runTest("testData/comparison/unchanged/unchangedPackageFacade/");
-        }
-    }
-
-    @RunWith(JUnit3RunnerWithInners.class)
-    @TestMetadata("testData/comparison/jvmOnly")
-    public static class JvmOnly extends AbstractJvmProtoComparisonTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-        }
-
-        @TestMetadata("classToFileFacade")
-        public void testClassToFileFacade() throws Exception {
-            runTest("testData/comparison/jvmOnly/classToFileFacade/");
-        }
-
-        @TestMetadata("membersFlagsChanged")
-        public void testMembersFlagsChanged() throws Exception {
-            runTest("testData/comparison/jvmOnly/membersFlagsChanged/");
-        }
-
-        @TestMetadata("packageFacadeMultifileClassChanged")
-        public void testPackageFacadeMultifileClassChanged() throws Exception {
-            runTest("testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/");
-        }
-
-        @TestMetadata("packageFacadeToClass")
-        public void testPackageFacadeToClass() throws Exception {
-            runTest("testData/comparison/jvmOnly/packageFacadeToClass/");
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/compilerUtils.kt b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/compilerUtils.kt
deleted file mode 100644
index ae8eb1c420ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/jps/incremental/compilerUtils.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.jps.incremental
-
-import org.jetbrains.kotlin.cli.common.ExitCode
-import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.js.K2JSCompiler
-import org.jetbrains.kotlin.compilerRunner.*
-import org.jetbrains.kotlin.config.Services
-import org.jetbrains.kotlin.jps.build.KotlinBuilder
-import java.io.BufferedReader
-import java.io.ByteArrayOutputStream
-import java.io.PrintStream
-import java.io.StringReader
-
-fun createTestingCompilerEnvironment(
-    messageCollector: MessageCollector,
-    outputItemsCollector: OutputItemsCollectorImpl,
-    services: Services
-): JpsCompilerEnvironment {
-    val wrappedMessageCollector = MessageCollectorToOutputItemsCollectorAdapter(messageCollector, outputItemsCollector)
-    return JpsCompilerEnvironment(
-        services,
-        KotlinBuilder.classesToLoadByParent,
-        wrappedMessageCollector,
-        outputItemsCollector,
-        MockProgressReporter
-    )
-}
-
-fun runJSCompiler(args: K2JSCompilerArguments, env: JpsCompilerEnvironment): ExitCode? {
-    val argsArray = ArgumentUtils.convertArgumentsToStringList(args).toTypedArray()
-
-    val stream = ByteArrayOutputStream()
-    val out = PrintStream(stream)
-    val exitCode = CompilerRunnerUtil.invokeExecMethod(K2JSCompiler::class.java.name, argsArray, env, out)
-    val reader = BufferedReader(StringReader(stream.toString()))
-    CompilerOutputParser.parseCompilerMessagesFromReader(env.messageCollector, reader, env.outputItemsCollector)
-    return exitCode as? ExitCode
-}
-
-private object MockProgressReporter : ProgressReporter {
-    override fun progress(message: String) {
-    }
-
-    override fun compilationStarted() {
-    }
-
-    override fun clearProgress() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
deleted file mode 100644
index f48da6ac0527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.jetbrains.kotlin.modules;
-
-import junit.framework.TestCase;
-import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
-import org.jetbrains.kotlin.build.JvmSourceRoot;
-import org.jetbrains.kotlin.idea.test.TestUtilsKt;
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class KotlinModuleXmlGeneratorTest extends TestCase {
-    private static String getTestDataPath() {
-        return TestUtilsKt.IDEA_TEST_DATA_DIR.getAbsolutePath() + "/modules.xml";
-    }
-
-    public void testBasic() {
-        String actual = new KotlinModuleXmlBuilder().addModule(
-                "name",
-                "output",
-                Arrays.asList(new File("s1"), new File("s2")),
-                Collections.singletonList(new JvmSourceRoot(new File("java"), null)),
-                Arrays.asList(new File("cp1"), new File("cp2")),
-                Collections.emptyList(),
-                null,
-                JavaModuleBuildTargetType.PRODUCTION.getTypeId(),
-                JavaModuleBuildTargetType.PRODUCTION.isTests(),
-                Collections.emptySet(),
-                Collections.emptyList()
-        ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/basic.xml"), actual);
-    }
-
-    public void testFiltered() {
-        String actual = new KotlinModuleXmlBuilder().addModule(
-                "name",
-                "output",
-                Arrays.asList(new File("s1"), new File("s2")),
-                Collections.emptyList(),
-                Arrays.asList(new File("cp1"), new File("cp2")),
-                Collections.emptyList(),
-                null,
-                JavaModuleBuildTargetType.PRODUCTION.getTypeId(),
-                JavaModuleBuildTargetType.PRODUCTION.isTests(),
-                Collections.singleton(new File("cp1")),
-                Collections.emptyList()
-        ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/filtered.xml"), actual);
-    }
-
-    public void testMultiple() {
-        KotlinModuleXmlBuilder builder = new KotlinModuleXmlBuilder();
-        builder.addModule(
-                "name",
-                "output",
-                Arrays.asList(new File("s1"), new File("s2")),
-                Collections.emptyList(),
-                Arrays.asList(new File("cp1"), new File("cp2")),
-                Collections.emptyList(),
-                null,
-                JavaModuleBuildTargetType.PRODUCTION.getTypeId(),
-                JavaModuleBuildTargetType.PRODUCTION.isTests(),
-                Collections.singleton(new File("cp1")),
-                Collections.emptyList()
-        );
-        builder.addModule(
-                "name2",
-                "output2",
-                Arrays.asList(new File("s12"), new File("s22")),
-                Collections.emptyList(),
-                Arrays.asList(new File("cp12"), new File("cp22")),
-                Collections.emptyList(),
-                null,
-                JavaModuleBuildTargetType.TEST.getTypeId(),
-                JavaModuleBuildTargetType.TEST.isTests(),
-                Collections.singleton(new File("cp12")),
-                Collections.emptyList()
-        );
-        String actual = builder.asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/multiple.xml"), actual);
-    }
-
-    public void testModularJdkRoot() {
-        String actual = new KotlinModuleXmlBuilder().addModule(
-                "name",
-                "output",
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList(),
-                Collections.emptyList(),
-                new File("/path/to/modular/jdk"),
-                JavaModuleBuildTargetType.PRODUCTION.getTypeId(),
-                JavaModuleBuildTargetType.PRODUCTION.isTests(),
-                Collections.emptySet(),
-                Collections.emptyList()
-        ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/modularJdkRoot.xml"), actual);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt
deleted file mode 100644
index 969d9f4d5cdb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-class ClassWithAddedCompanionObject {
-    public fun unchangedFun() {}
-    companion object {}
-}
-
-class ClassWithRemovedCompanionObject {
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedCompanionObject {
-    public fun unchangedFun() {}
-    companion object SecondName {}
-}
-
-class ClassWithChangedVisibilityForCompanionObject {
-    public fun unchangedFun() {}
-    private companion object {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt
deleted file mode 100644
index 93907babbb4f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package test
-
-class ClassWithAddedCompanionObject {
-    public fun unchangedFun() {}
-}
-
-class ClassWithRemovedCompanionObject {
-    public fun unchangedFun() {}
-    companion object {}
-}
-
-class ClassWithChangedCompanionObject {
-    public fun unchangedFun() {}
-    companion object FirstName {}
-}
-
-class ClassWithChangedVisibilityForCompanionObject {
-    public fun unchangedFun() {}
-    public companion object {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out
deleted file mode 100644
index 4b1b2fd2f9ec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out
+++ /dev/null
@@ -1,15 +0,0 @@
-REMOVED test/ClassWithChangedCompanionObject.FirstName
-REMOVED test/ClassWithRemovedCompanionObject.Companion
-ADDED test/ClassWithAddedCompanionObject.Companion
-ADDED test/ClassWithChangedCompanionObject.SecondName
-PROTO DIFFERENCE in test/ClassWithAddedCompanionObject: COMPANION_OBJECT_NAME, NESTED_CLASS_NAME_LIST
-CHANGES in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS
-    [Companion]
-PROTO DIFFERENCE in test/ClassWithChangedCompanionObject: COMPANION_OBJECT_NAME, NESTED_CLASS_NAME_LIST
-CHANGES in test/ClassWithChangedCompanionObject: CLASS_SIGNATURE, MEMBERS
-    [FirstName, SecondName]
-PROTO DIFFERENCE in test/ClassWithChangedVisibilityForCompanionObject.Companion: FLAGS
-CHANGES in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithRemovedCompanionObject: COMPANION_OBJECT_NAME, NESTED_CLASS_NAME_LIST
-CHANGES in test/ClassWithRemovedCompanionObject: CLASS_SIGNATURE, MEMBERS
-    [Companion]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt
deleted file mode 100644
index cdd184116b8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package test
-
-class ClassWithPrimaryConstructorChanged constructor(arg: String) {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrimaryConstructorVisibilityChanged private constructor() {
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorsAdded() {
-    constructor(arg: Int): this() {}
-    constructor(arg: String): this() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorsRemoved() {
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorVisibilityChanged() {
-    private constructor(arg: Int): this() {}
-    public fun unchangedFun() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt
deleted file mode 100644
index 86eda90550d0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package test
-
-class ClassWithPrimaryConstructorChanged constructor() {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrimaryConstructorVisibilityChanged constructor() {
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorsAdded {
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorsRemoved() {
-    public constructor(arg: Int): this() {}
-    constructor(arg: String): this() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithSecondaryConstructorVisibilityChanged() {
-    protected constructor(arg: Int): this() {}
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out
deleted file mode 100644
index c6d44c58290a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out
+++ /dev/null
@@ -1,10 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithPrimaryConstructorChanged: CONSTRUCTOR_LIST
-CHANGES in test/ClassWithPrimaryConstructorChanged: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithPrimaryConstructorVisibilityChanged: CONSTRUCTOR_LIST
-CHANGES in test/ClassWithPrimaryConstructorVisibilityChanged: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithSecondaryConstructorVisibilityChanged: CONSTRUCTOR_LIST
-CHANGES in test/ClassWithSecondaryConstructorVisibilityChanged: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithSecondaryConstructorsAdded: CONSTRUCTOR_LIST
-CHANGES in test/ClassWithSecondaryConstructorsAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithSecondaryConstructorsRemoved: CONSTRUCTOR_LIST
-CHANGES in test/ClassWithSecondaryConstructorsRemoved: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt
deleted file mode 100644
index 2eb9659e8016..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package test
-
-class ClassWithFunAdded {
-    fun added() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithFunRemoved {
-    public fun unchangedFun() {}
-}
-
-class ClassWithValAndFunAddedAndRemoved {
-    public val valAdded: String = ""
-    fun funAdded() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithValConvertedToVar {
-    public var value: Int = 10
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisiblityForFun1 {
-    private fun foo() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisiblityForFun2 {
-    protected fun foo() {}
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt
deleted file mode 100644
index e8ca9bd1db51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package test
-
-class ClassWithFunAdded {
-    public fun unchangedFun() {}
-}
-
-class ClassWithFunRemoved {
-    fun removed() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithValAndFunAddedAndRemoved {
-    public val valRemoved: Int = 10
-    fun funRemoved() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithValConvertedToVar {
-    public val value: Int = 10
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisiblityForFun1 {
-    protected fun foo() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisiblityForFun2 {
-    private fun foo() {}
-    public fun unchangedFun() {}
-}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out
deleted file mode 100644
index 893ef9db9927..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out
+++ /dev/null
@@ -1,18 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithChangedVisiblityForFun1: FUNCTION_LIST
-CHANGES in test/ClassWithChangedVisiblityForFun1: MEMBERS
-    [foo]
-PROTO DIFFERENCE in test/ClassWithChangedVisiblityForFun2: FUNCTION_LIST
-CHANGES in test/ClassWithChangedVisiblityForFun2: MEMBERS
-    [foo]
-PROTO DIFFERENCE in test/ClassWithFunAdded: FUNCTION_LIST
-CHANGES in test/ClassWithFunAdded: MEMBERS
-    [added]
-PROTO DIFFERENCE in test/ClassWithFunRemoved: FUNCTION_LIST
-CHANGES in test/ClassWithFunRemoved: MEMBERS
-    [removed]
-PROTO DIFFERENCE in test/ClassWithValAndFunAddedAndRemoved: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/ClassWithValAndFunAddedAndRemoved: MEMBERS
-    [funAdded, funRemoved, valAdded, valRemoved]
-PROTO DIFFERENCE in test/ClassWithValConvertedToVar: PROPERTY_LIST
-CHANGES in test/ClassWithValConvertedToVar: MEMBERS
-    [value]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt
deleted file mode 100644
index 02acd55cbcf7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-class ClassWithNestedClasses {
-    class NestedClassAdded {}
-    inner class InnerClass {}
-    inner class InnerClassAdded {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisibilityForNestedClasses {
-    private class NestedClass {}
-    protected inner class InnerClass {}
-    public fun unchangedFun() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt
deleted file mode 100644
index 35d66d1a9e6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package test
-
-class ClassWithNestedClasses {
-    class NestedClassRemoved {}
-    inner class InnerClass {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithChangedVisibilityForNestedClasses {
-    class NestedClass {}
-    inner class InnerClass {}
-    public fun unchangedFun() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out
deleted file mode 100644
index a9cac338305b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out
+++ /dev/null
@@ -1,10 +0,0 @@
-REMOVED test/ClassWithNestedClasses.NestedClassRemoved
-ADDED test/ClassWithNestedClasses.InnerClassAdded
-ADDED test/ClassWithNestedClasses.NestedClassAdded
-PROTO DIFFERENCE in test/ClassWithChangedVisibilityForNestedClasses.InnerClass: FLAGS
-CHANGES in test/ClassWithChangedVisibilityForNestedClasses.InnerClass: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithChangedVisibilityForNestedClasses.NestedClass: FLAGS
-CHANGES in test/ClassWithChangedVisibilityForNestedClasses.NestedClass: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassWithNestedClasses: NESTED_CLASS_NAME_LIST
-CHANGES in test/ClassWithNestedClasses: MEMBERS
-    [InnerClassAdded, NestedClassAdded, NestedClassRemoved]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt
deleted file mode 100644
index ae88ae502727..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-enum class EnumClassWithChanges {
-    CONST_1,
-    CONST_3,
-    CONST_4
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt
deleted file mode 100644
index 764e08538ad9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-enum class EnumClassWithChanges {
-    CONST_1,
-    CONST_2
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result-js.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result-js.out
deleted file mode 100644
index 1b76c1cf0c87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result-js.out
+++ /dev/null
@@ -1,5 +0,0 @@
-REMOVED test/EnumClassWithChanges.CONST_2
-ADDED test/EnumClassWithChanges.CONST_3
-ADDED test/EnumClassWithChanges.CONST_4
-PROTO DIFFERENCE in test/EnumClassWithChanges: ENUM_ENTRY_LIST
-CHANGES in test/EnumClassWithChanges: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out
deleted file mode 100644
index 83215375ccf4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out
+++ /dev/null
@@ -1,2 +0,0 @@
-PROTO DIFFERENCE in test/EnumClassWithChanges: ENUM_ENTRY_LIST
-CHANGES in test/EnumClassWithChanges: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt
deleted file mode 100644
index b8fdf2c6d412..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package test
-
-class A {
-    fun argumentAdded(x: Int = 1) {}
-    fun argumentRemoved() {}
-
-    fun valueAdded(x: Int = 3) {}
-    fun valueRemoved(x: Int) {}
-    fun valueChanged(x: Int = 6) {}
-}
-
-class ConstructorValueAdded(x: Int = 7)
-class ConstructorValueRemoved(x: Int)
-class ConstructorValueChanged(x: Int = 20)
-
-class ConstructorArgumentAdded(x: Int = 9)
-class ConstructorArgumentRemoved()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt
deleted file mode 100644
index e4bca5f45150..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package test
-
-class A {
-    fun argumentAdded() {}
-    fun argumentRemoved(x: Int = 2) {}
-
-    fun valueAdded(x: Int) {}
-    fun valueRemoved(x: Int = 4) {}
-    fun valueChanged(x: Int = 5) {}
-}
-
-class ConstructorValueAdded(x: Int)
-class ConstructorValueRemoved(x: Int = 8)
-class ConstructorValueChanged(x: Int = 19)
-
-class ConstructorArgumentAdded()
-class ConstructorArgumentRemoved(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/result.out
deleted file mode 100644
index 9ff9602f7733..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/defaultValues/result.out
+++ /dev/null
@@ -1,11 +0,0 @@
-PROTO DIFFERENCE in test/A: FUNCTION_LIST
-CHANGES in test/A: MEMBERS
-    [argumentAdded, argumentRemoved, valueAdded, valueRemoved]
-PROTO DIFFERENCE in test/ConstructorArgumentAdded: CONSTRUCTOR_LIST
-CHANGES in test/ConstructorArgumentAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ConstructorArgumentRemoved: CONSTRUCTOR_LIST
-CHANGES in test/ConstructorArgumentRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ConstructorValueAdded: CONSTRUCTOR_LIST
-CHANGES in test/ConstructorValueAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ConstructorValueRemoved: CONSTRUCTOR_LIST
-CHANGES in test/ConstructorValueRemoved: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/new.kt
deleted file mode 100644
index b3b358a2685a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/new.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-class A {
-    @Ann1
-    @Ann2
-    fun annotationListBecameNotEmpty() {}
-
-    fun annotationListBecameEmpty() {}
-
-    @Ann1
-    @Ann2
-    fun annotationAdded() {}
-
-    @Ann1
-    fun annotationRemoved() {}
-
-    @Ann2
-    fun annotationReplaced() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/old.kt
deleted file mode 100644
index 555cf7288218..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/old.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-class A {
-    fun annotationListBecameNotEmpty() {}
-
-    @Ann1
-    @Ann2
-    fun annotationListBecameEmpty() {
-    }
-
-    @Ann1
-    fun annotationAdded() {
-    }
-
-    @Ann1
-    @Ann2
-    fun annotationRemoved() {
-    }
-
-    @Ann1
-    fun annotationReplaced() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result-js.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result-js.out
deleted file mode 100644
index bab37471ef4f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result-js.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/A: FUNCTION_LIST
-CHANGES in test/A: MEMBERS
-    [annotationAdded, annotationListBecameEmpty, annotationListBecameNotEmpty, annotationRemoved, annotationReplaced]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result.out
deleted file mode 100644
index b5e1a1ed1712..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/A: FUNCTION_LIST
-CHANGES in test/A: MEMBERS
-    [annotationListBecameEmpty, annotationListBecameNotEmpty]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt
deleted file mode 100644
index e9da791aa131..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package test
-
-abstract class A {
-    abstract val abstractFlagAddedVal: String
-    val abstractFlagRemovedVal: String = ""
-    abstract val abstractFlagUnchangedVal: String
-    abstract fun abstractFlagAddedFun()
-    fun abstractFlagRemovedFun() {}
-    abstract fun abstractFlagUnchangedFun()
-
-    final val finalFlagAddedVal = ""
-    val finalFlagRemovedVal = ""
-    final val finalFlagUnchangedVal = ""
-    final fun finalFlagAddedFun() {}
-    fun finalFlagRemovedFun() {}
-    final fun finalFlagUnchangedFun() {}
-
-    @Suppress("INAPPLICABLE_INFIX_MODIFIER")
-    infix fun infixFlagAddedFun() {}
-    fun infixFlagRemovedFun() {}
-    @Suppress("INAPPLICABLE_INFIX_MODIFIER")
-    infix fun infixFlagUnchangedFun() {}
-
-    inline fun inlineFlagAddedFun() {}
-    fun inlineFlagRemovedFun() {}
-    inline fun inlineFlagUnchangedFun() {}
-
-    internal val internalFlagAddedVal = ""
-    val internalFlagRemovedVal = ""
-    internal val internalFlagUnchangedVal = ""
-    internal fun internalFlagAddedFun() {}
-    fun internalFlagRemovedFun() {}
-    internal fun internalFlagUnchangedFun() {}
-
-    lateinit var lateinitFlagAddedVal: String
-    var lateinitFlagRemovedVal: String = ""
-    lateinit var lateinitFlagUnchangedVal: String
-
-    open val openFlagAddedVal = ""
-    val openFlagRemovedVal = ""
-    open val openFlagUnchangedVal = ""
-    open fun openFlagAddedFun() {}
-    fun openFlagRemovedFun() {}
-    open fun openFlagUnchangedFun() {}
-
-    @Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-    operator fun operatorFlagAddedFun() {}
-    fun operatorFlagRemovedFun() {}
-    @Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-    operator fun operatorFlagUnchangedFun() {}
-
-    private val privateFlagAddedVal = ""
-    val privateFlagRemovedVal = ""
-    private val privateFlagUnchangedVal = ""
-    private fun privateFlagAddedFun() {}
-    fun privateFlagRemovedFun() {}
-    private fun privateFlagUnchangedFun() {}
-
-    protected val protectedFlagAddedVal = ""
-    val protectedFlagRemovedVal = ""
-    protected val protectedFlagUnchangedVal = ""
-    protected fun protectedFlagAddedFun() {}
-    fun protectedFlagRemovedFun() {}
-    protected fun protectedFlagUnchangedFun() {}
-
-    public val publicFlagAddedVal = ""
-    val publicFlagRemovedVal = ""
-    public val publicFlagUnchangedVal = ""
-    public fun publicFlagAddedFun() {}
-    fun publicFlagRemovedFun() {}
-    public fun publicFlagUnchangedFun() {}
-
-    tailrec fun tailrecFlagAddedFun() {}
-    fun tailrecFlagRemovedFun() {}
-    tailrec fun tailrecFlagUnchangedFun() {}
-
-    val noFlagsUnchangedVal = ""
-    fun noFlagsUnchangedFun() {}
-}
-
-object O {
-    const val constFlagAddedVal = ""
-    val constFlagRemovedVal = ""
-    const val constFlagUnchangedVal = ""
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt
deleted file mode 100644
index 8eaad77a5d10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package test
-
-abstract class A {
-    val abstractFlagAddedVal: String = ""
-    abstract val abstractFlagRemovedVal: String
-    abstract val abstractFlagUnchangedVal: String
-    fun abstractFlagAddedFun() {}
-    abstract fun abstractFlagRemovedFun()
-    abstract fun abstractFlagUnchangedFun()
-
-    val finalFlagAddedVal = ""
-    final val finalFlagRemovedVal = ""
-    final val finalFlagUnchangedVal = ""
-    fun finalFlagAddedFun() {}
-    final fun finalFlagRemovedFun() {}
-    final fun finalFlagUnchangedFun() {}
-
-    fun infixFlagAddedFun() {}
-    @Suppress("INAPPLICABLE_INFIX_MODIFIER")
-    infix fun infixFlagRemovedFun() {}
-    @Suppress("INAPPLICABLE_INFIX_MODIFIER")
-    infix fun infixFlagUnchangedFun() {}
-
-    fun inlineFlagAddedFun() {}
-    inline fun inlineFlagRemovedFun() {}
-    inline fun inlineFlagUnchangedFun() {}
-
-    val internalFlagAddedVal = ""
-    internal val internalFlagRemovedVal = ""
-    internal val internalFlagUnchangedVal = ""
-    fun internalFlagAddedFun() {}
-    internal fun internalFlagRemovedFun() {}
-    internal fun internalFlagUnchangedFun() {}
-
-    var lateinitFlagAddedVal = ""
-    lateinit var lateinitFlagRemovedVal: String
-    lateinit var lateinitFlagUnchangedVal: String
-
-    val openFlagAddedVal = ""
-    open val openFlagRemovedVal = ""
-    open val openFlagUnchangedVal = ""
-    fun openFlagAddedFun() {}
-    open fun openFlagRemovedFun() {}
-    open fun openFlagUnchangedFun() {}
-
-    fun operatorFlagAddedFun() {}
-    @Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-    operator fun operatorFlagRemovedFun() {}
-    @Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-    operator fun operatorFlagUnchangedFun() {}
-
-    val privateFlagAddedVal = ""
-    private val privateFlagRemovedVal = ""
-    private val privateFlagUnchangedVal = ""
-    fun privateFlagAddedFun() {}
-    private fun privateFlagRemovedFun() {}
-    private fun privateFlagUnchangedFun() {}
-
-    val protectedFlagAddedVal = ""
-    protected val protectedFlagRemovedVal = ""
-    protected val protectedFlagUnchangedVal = ""
-    fun protectedFlagAddedFun() {}
-    protected fun protectedFlagRemovedFun() {}
-    protected fun protectedFlagUnchangedFun() {}
-
-    val publicFlagAddedVal = ""
-    public val publicFlagRemovedVal = ""
-    public val publicFlagUnchangedVal = ""
-    fun publicFlagAddedFun() {}
-    public fun publicFlagRemovedFun() {}
-    public fun publicFlagUnchangedFun() {}
-
-    fun tailrecFlagAddedFun() {}
-    tailrec fun tailrecFlagRemovedFun() {}
-    tailrec fun tailrecFlagUnchangedFun() {}
-
-    val noFlagsUnchangedVal = ""
-    fun noFlagsUnchangedFun() {}
-}
-
-object O {
-    val constFlagAddedVal = ""
-    const val constFlagRemovedVal = ""
-    const val constFlagUnchangedVal = ""
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out
deleted file mode 100644
index 1516040346b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out
+++ /dev/null
@@ -1,6 +0,0 @@
-PROTO DIFFERENCE in test/A: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/A: MEMBERS
-    [abstractFlagAddedFun, abstractFlagAddedVal, abstractFlagRemovedFun, abstractFlagRemovedVal, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, lateinitFlagAddedVal, lateinitFlagRemovedVal, openFlagAddedFun, openFlagAddedVal, openFlagRemovedFun, openFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, protectedFlagAddedFun, protectedFlagAddedVal, protectedFlagRemovedFun, protectedFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun]
-PROTO DIFFERENCE in test/O: PROPERTY_LIST
-CHANGES in test/O: MEMBERS
-    [constFlagAddedVal, constFlagRemovedVal]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/new.kt
deleted file mode 100644
index e70454ffb41b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/new.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Base {
-    class Nested1 {
-        class Nested2 {
-            fun added() {}
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/old.kt
deleted file mode 100644
index d3aacfa415cd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Base {
-    class Nested1 {
-        class Nested2 {
-            fun removed() {}
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/result.out
deleted file mode 100644
index 595aff442801..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/Base.Nested1.Nested2: FUNCTION_LIST
-CHANGES in test/Base.Nested1.Nested2: MEMBERS
-    [added, removed]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt
deleted file mode 100644
index 7971271f92ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-sealed class Base {
-    class A : Base()
-    class B : Base()
-    class C : Base()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt
deleted file mode 100644
index c5cd9afb81d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-sealed class Base {
-    class A : Base()
-    class B : Base()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out
deleted file mode 100644
index 4df937b22730..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out
+++ /dev/null
@@ -1,4 +0,0 @@
-ADDED test/Base.C
-PROTO DIFFERENCE in test/Base: NESTED_CLASS_NAME_LIST, SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base: CLASS_SIGNATURE, MEMBERS
-    [C]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt
deleted file mode 100644
index c3f0b8f68a67..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-class ClassWithPrivateFunAdded {
-    private fun privateFun() {}
-    val s = "20"
-}
-
-class ClassWithPrivateFunRemoved {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateFunSignatureChanged {
-    private fun privateFun(arg: Int) {}
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt
deleted file mode 100644
index 79ad31fa40ef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-class ClassWithPrivateFunAdded {
-    val s = "20"
-}
-
-class ClassWithPrivateFunRemoved {
-    private fun privateFun() {}
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateFunSignatureChanged {
-    private fun privateFun(arg: String) {}
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out
deleted file mode 100644
index 3fad652b4c31..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithPrivateFunAdded: FUNCTION_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateFunRemoved: FUNCTION_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateFunSignatureChanged: FUNCTION_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt
deleted file mode 100644
index 6d08e307d8d9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-class ClassWithPrivatePrimaryConstructorAdded private constructor() {
-    private constructor(arg: Int) : this() {}
-}
-
-class ClassWithPrivatePrimaryConstructorRemoved {
-    private constructor(arg: Int) {}
-}
-
-class ClassWithPrivatePrimaryConstructorChanged private constructor(arg: String) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt
deleted file mode 100644
index 05b24c69e569..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-class ClassWithPrivatePrimaryConstructorAdded {
-    private constructor(arg: Int) {}
-}
-
-class ClassWithPrivatePrimaryConstructorRemoved private constructor() {
-    private constructor(arg: Int) : this() {}
-}
-
-class ClassWithPrivatePrimaryConstructorChanged private constructor() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out
deleted file mode 100644
index afa4553e11b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithPrivatePrimaryConstructorAdded: CONSTRUCTOR_LIST
-PROTO DIFFERENCE in test/ClassWithPrivatePrimaryConstructorChanged: CONSTRUCTOR_LIST
-PROTO DIFFERENCE in test/ClassWithPrivatePrimaryConstructorRemoved: CONSTRUCTOR_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt
deleted file mode 100644
index 7cf273358f77..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-class ClassWithPrivateSecondaryConstructorsAdded() {
-    private constructor(arg: Int) : this() {}
-    private constructor(arg: String) : this() {}
-}
-
-class ClassWithPrivateSecondaryConstructorsAdded2() {
-    private constructor(arg: Int) : this() {}
-    private constructor(arg: String) : this() {}
-    constructor(arg: Float) : this() {}
-}
-
-class ClassWithPrivateSecondaryConstructorsRemoved() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt
deleted file mode 100644
index 53b981e8996f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-class ClassWithPrivateSecondaryConstructorsAdded {
-}
-
-class ClassWithPrivateSecondaryConstructorsAdded2() {
-    constructor(arg: Float) : this() {}
-}
-
-class ClassWithPrivateSecondaryConstructorsRemoved() {
-    private constructor(arg: Int): this() {}
-    private constructor(arg: String): this() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out
deleted file mode 100644
index bacb315a8bda..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithPrivateSecondaryConstructorsAdded: CONSTRUCTOR_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateSecondaryConstructorsAdded2: CONSTRUCTOR_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateSecondaryConstructorsRemoved: CONSTRUCTOR_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt
deleted file mode 100644
index 178a89088c66..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package test
-
-class ClassWithPrivateValAdded {
-    private val x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateValRemoved {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateValSignatureChanged {
-    private val x: String = "X"
-    public fun unchangedFun() {}
-}
-
-class ClassWithGetterForPrivateValChanged {
-    private val x: Int
-        get() = 200
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt
deleted file mode 100644
index 5576e86c9889..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-class ClassWithPrivateValAdded {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateValRemoved {
-    private val x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateValSignatureChanged {
-    private val x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithGetterForPrivateValChanged {
-    private val x: Int = 100
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out
deleted file mode 100644
index 93c2d0dff6eb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out
+++ /dev/null
@@ -1,4 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithGetterForPrivateValChanged: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateValAdded: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateValRemoved: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateValSignatureChanged: PROPERTY_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt
deleted file mode 100644
index 9024562066d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package test
-
-class ClassWithPrivateVarAdded {
-    private var x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateVarRemoved {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateVarSignatureChanged {
-    private var x: String = "X"
-    public fun unchangedFun() {}
-}
-
-class ClassWithGetterAndSetterForPrivateVarChanged {
-    private var x: Int
-    get() = 200
-    set(value) {}
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt
deleted file mode 100644
index ad239436f24f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-class ClassWithPrivateVarAdded {
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateVarRemoved {
-    private var x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithPrivateVarSignatureChanged {
-    private var x: Int = 100
-    public fun unchangedFun() {}
-}
-
-class ClassWithGetterAndSetterForPrivateVarChanged {
-    private var x: Int = 100
-    public fun unchangedFun() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out
deleted file mode 100644
index 379b7b4213ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out
+++ /dev/null
@@ -1,4 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithGetterAndSetterForPrivateVarChanged: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateVarAdded: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateVarRemoved: PROPERTY_LIST
-PROTO DIFFERENCE in test/ClassWithPrivateVarSignatureChanged: PROPERTY_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt
deleted file mode 100644
index fc7bee7454cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-@Ann1
-@Ann2
-class AnnotationListBecomeNotEmpty
-
-class AnnotationListBecomeEmpty
-
-@Ann1
-@Ann2
-class AnnotationAdded
-
-@Ann1
-class AnnotationRemoved
-
-@Ann2
-class AnnotationReplaced
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt
deleted file mode 100644
index 517cdb5d01a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-class AnnotationListBecomeNotEmpty
-
-@Ann1
-@Ann2
-class AnnotationListBecomeEmpty
-
-@Ann1
-class AnnotationAdded
-
-@Ann1
-@Ann2
-class AnnotationRemoved
-
-@Ann1
-class AnnotationReplaced
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out
deleted file mode 100644
index 78f93fce59a2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result-js.out
+++ /dev/null
@@ -1,10 +0,0 @@
-PROTO DIFFERENCE in test/AnnotationAdded: JS_EXT_CLASS_ANNOTATION_LIST
-CHANGES in test/AnnotationAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationListBecomeEmpty: FLAGS, JS_EXT_CLASS_ANNOTATION_LIST
-CHANGES in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationListBecomeNotEmpty: FLAGS, JS_EXT_CLASS_ANNOTATION_LIST
-CHANGES in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationRemoved: JS_EXT_CLASS_ANNOTATION_LIST
-CHANGES in test/AnnotationRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationReplaced: JS_EXT_CLASS_ANNOTATION_LIST
-CHANGES in test/AnnotationReplaced: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out
deleted file mode 100644
index 7ceb65bf4632..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out
+++ /dev/null
@@ -1,4 +0,0 @@
-PROTO DIFFERENCE in test/AnnotationListBecomeEmpty: FLAGS
-CHANGES in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationListBecomeNotEmpty: FLAGS
-CHANGES in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt
deleted file mode 100644
index 5ea958883c36..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-open class A {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt
deleted file mode 100644
index 926842376c92..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out
deleted file mode 100644
index 9113a0027fd0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/A: FLAGS, FUNCTION_LIST
-CHANGES in test/A: CLASS_SIGNATURE, MEMBERS
-    [f]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/new.kt
deleted file mode 100644
index 3ecb27bbb47a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/new.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package test
-
-abstract class AbstractFlagAdded
-class AbstractFlagRemoved
-abstract class AbstractFlagUnchanged
-
-annotation class AnnotationFlagAdded
-class AnnotationFlagRemoved
-annotation class AnnotationFlagUnchanged
-
-data class DataFlagAdded(val x: Int)
-class DataFlagRemoved(val x: Int)
-data class DataFlagUnchanged(val x: Int)
-
-enum class EnumFlagAdded
-class EnumFlagRemoved
-enum class EnumFlagUnchanged
-
-final class FinalFlagAdded
-class FinalFlagRemoved
-final class FinalFlagUnchanged
-
-class InnerClassHolder {
-    inner class InnerFlagAdded
-    class InnerFlagRemoved
-    inner class InnerFlagUnchanged
-}
-
-internal class InternalFlagAdded
-class InternalFlagRemoved
-internal class InternalFlagUnchanged
-
-open class OpenFlagAdded
-class OpenFlagRemoved
-open class OpenFlagUnchanged
-
-private class PrivateFlagAdded
-class PrivateFlagRemoved
-private class PrivateFlagUnchanged
-
-class ProtectedClassHolder {
-    protected class ProtectedFlagAdded
-    class ProtectedFlagRemoved
-    protected class ProtectedFlagUnchanged
-}
-
-public class PublicFlagAdded
-class PublicFlagRemoved
-public class PublicFlagUnchanged
-
-sealed class SealedFlagAdded
-class SealedFlagRemoved
-sealed class SealedFlagUnchanged
-
-class UnchangedNoFlags
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/old.kt
deleted file mode 100644
index 756c07a80ee3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/old.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package test
-
-class AbstractFlagAdded
-abstract class AbstractFlagRemoved
-abstract class AbstractFlagUnchanged
-
-class AnnotationFlagAdded
-annotation class AnnotationFlagRemoved
-annotation class AnnotationFlagUnchanged
-
-class DataFlagAdded(val x: Int)
-data class DataFlagRemoved(val x: Int)
-data class DataFlagUnchanged(val x: Int)
-
-class EnumFlagAdded
-enum class EnumFlagRemoved
-enum class EnumFlagUnchanged
-
-class FinalFlagAdded
-final class FinalFlagRemoved
-final class FinalFlagUnchanged
-
-class InnerClassHolder {
-    class InnerFlagAdded
-    inner class InnerFlagRemoved
-    inner class InnerFlagUnchanged
-}
-
-class InternalFlagAdded
-internal class InternalFlagRemoved
-internal class InternalFlagUnchanged
-
-class OpenFlagAdded
-open class OpenFlagRemoved
-open class OpenFlagUnchanged
-
-class PrivateFlagAdded
-private class PrivateFlagRemoved
-private class PrivateFlagUnchanged
-
-class ProtectedClassHolder {
-    class ProtectedFlagAdded
-    protected class ProtectedFlagRemoved
-    protected class ProtectedFlagUnchanged
-}
-
-class PublicFlagAdded
-public class PublicFlagRemoved
-public class PublicFlagUnchanged
-
-class SealedFlagAdded
-sealed class SealedFlagRemoved
-sealed class SealedFlagUnchanged
-
-class UnchangedNoFlags
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out
deleted file mode 100644
index 95f7d8309bcf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out
+++ /dev/null
@@ -1,46 +0,0 @@
-PROTO DIFFERENCE in test/AbstractFlagAdded: FLAGS
-CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS
-CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationFlagAdded: FLAGS, SUPERTYPE_LIST
-CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS
-    [kotlin.Annotation, kotlin.Any]
-PROTO DIFFERENCE in test/AnnotationFlagRemoved: FLAGS, SUPERTYPE_LIST
-CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS
-    [kotlin.Annotation, kotlin.Any]
-PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST
-CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS
-    [component1, copy, equals, hashCode, toString]
-PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST
-CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS
-    [component1, copy, equals, hashCode, toString]
-PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, kotlin.Enum]
-PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, kotlin.Enum]
-PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: FLAGS
-CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: FLAGS
-CHANGES in test/InnerClassHolder.InnerFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InternalFlagAdded: FLAGS
-CHANGES in test/InternalFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InternalFlagRemoved: FLAGS
-CHANGES in test/InternalFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/OpenFlagAdded: FLAGS
-CHANGES in test/OpenFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/OpenFlagRemoved: FLAGS
-CHANGES in test/OpenFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/PrivateFlagAdded: FLAGS
-CHANGES in test/PrivateFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/PrivateFlagRemoved: FLAGS
-CHANGES in test/PrivateFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ProtectedClassHolder.ProtectedFlagAdded: FLAGS
-CHANGES in test/ProtectedClassHolder.ProtectedFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ProtectedClassHolder.ProtectedFlagRemoved: FLAGS
-CHANGES in test/ProtectedClassHolder.ProtectedFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/SealedFlagAdded: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/SealedFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/SealedFlagRemoved: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/SealedFlagRemoved: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result.out
deleted file mode 100644
index f00772bb93a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classFlagsChanged/result.out
+++ /dev/null
@@ -1,46 +0,0 @@
-PROTO DIFFERENCE in test/AbstractFlagAdded: FLAGS
-CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS
-CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/AnnotationFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS
-    [kotlin.Annotation, kotlin.Any]
-PROTO DIFFERENCE in test/AnnotationFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS
-    [kotlin.Annotation, kotlin.Any]
-PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST
-CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS
-    [component1, copy, equals, hashCode, toString]
-PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST
-CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS
-    [component1, copy, equals, hashCode, toString]
-PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, kotlin.Enum]
-PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST
-CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, kotlin.Enum]
-PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/InnerClassHolder.InnerFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InternalFlagAdded: FLAGS
-CHANGES in test/InternalFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/InternalFlagRemoved: FLAGS
-CHANGES in test/InternalFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/OpenFlagAdded: FLAGS
-CHANGES in test/OpenFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/OpenFlagRemoved: FLAGS
-CHANGES in test/OpenFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/PrivateFlagAdded: FLAGS
-CHANGES in test/PrivateFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/PrivateFlagRemoved: FLAGS
-CHANGES in test/PrivateFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ProtectedClassHolder.ProtectedFlagAdded: FLAGS
-CHANGES in test/ProtectedClassHolder.ProtectedFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ProtectedClassHolder.ProtectedFlagRemoved: FLAGS
-CHANGES in test/ProtectedClassHolder.ProtectedFlagRemoved: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/SealedFlagAdded: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/SealedFlagAdded: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/SealedFlagRemoved: CONSTRUCTOR_LIST, FLAGS
-CHANGES in test/SealedFlagRemoved: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt
deleted file mode 100644
index 9d081c29471a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-import kotlin.annotation.*
-
-class ClassWithTypeParameterListChanged<U> {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt
deleted file mode 100644
index b52cabd29398..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-class ClassWithTypeParameterListChanged<U, V> {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out
deleted file mode 100644
index 804a5af5aae2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out
+++ /dev/null
@@ -1,2 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithTypeParameterListChanged: TYPE_PARAMETER_LIST
-CHANGES in test/ClassWithTypeParameterListChanged: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt
deleted file mode 100644
index 7632cc8272eb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-class ClassWithSuperTypeListChanged : Throwable() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt
deleted file mode 100644
index 9228402497cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class ClassWithSuperTypeListChanged {
-}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out
deleted file mode 100644
index b1c4bef6ae73..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/ClassWithSuperTypeListChanged: SUPERTYPE_LIST
-CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, kotlin.Throwable]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/new.kt
deleted file mode 100644
index ade1f6fb0335..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/new.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-open class Base {
-    class Nested1 {
-        class Nested2
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/old.kt
deleted file mode 100644
index bdc78a8f0327..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/old.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-open class Base {
-    class Nested1 {
-        class Nested2 : Base()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out
deleted file mode 100644
index d6e8eed1c390..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/Base.Nested1.Nested2: SUPERTYPE_LIST
-CHANGES in test/Base.Nested1.Nested2: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/new.kt
deleted file mode 100644
index 5c4d97e02322..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/new.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-sealed class Base1
-class Impl1 : Base1()
-class Impl11 : Base1()
-
-sealed class Base2
-class Impl2 : Base2()
-class Impl22 : Base2()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/old.kt
deleted file mode 100644
index bfb054c9fbbe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/old.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-sealed class Base1
-class Impl1 : Base1()
-
-sealed class Base2
-class Impl2 : Base2()
-class Impl22
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out
deleted file mode 100644
index 9c70f14d0aaa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out
+++ /dev/null
@@ -1,8 +0,0 @@
-ADDED test/Impl11
-PROTO DIFFERENCE in test/Base1: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base1: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base2: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST
-CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base2]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/new.kt
deleted file mode 100644
index bfb054c9fbbe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/new.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-sealed class Base1
-class Impl1 : Base1()
-
-sealed class Base2
-class Impl2 : Base2()
-class Impl22
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/old.kt
deleted file mode 100644
index 5c4d97e02322..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-sealed class Base1
-class Impl1 : Base1()
-class Impl11 : Base1()
-
-sealed class Base2
-class Impl2 : Base2()
-class Impl22 : Base2()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out
deleted file mode 100644
index 2fa142e3f9b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out
+++ /dev/null
@@ -1,8 +0,0 @@
-REMOVED test/Impl11
-PROTO DIFFERENCE in test/Base1: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base1: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base2: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST
-CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base2]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/new.kt
deleted file mode 100644
index 17258934aca3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/new.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-sealed class Base1 {
-    class Nested1 : Base1()
-    class Nested2 : Base1()
-}
-
-sealed class Base2 {
-    class Nested1 : Base2()
-    class Nested2 : Base2()
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/old.kt
deleted file mode 100644
index bc57072314f6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/old.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-sealed class Base1 {
-    class Nested1 : Base1()
-}
-
-sealed class Base2 {
-    class Nested1 : Base2()
-    class Nested2
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out
deleted file mode 100644
index e64c6353c17d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out
+++ /dev/null
@@ -1,9 +0,0 @@
-ADDED test/Base1.Nested2
-PROTO DIFFERENCE in test/Base1: NESTED_CLASS_NAME_LIST, SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS
-    [Nested2]
-PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base2: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST
-CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base2]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/new.kt
deleted file mode 100644
index 4f3c46b44e1d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/new.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package test
-
-sealed class Base1 {
-    sealed class Nested1 : Base1() {
-        sealed class Nested2 : Nested1() {
-            class Nested3 : Nested2()
-        }
-    }
-}
-
-sealed class Base2 {
-    sealed class Nested1 : Base2() {
-        class Nested2 : Nested1()
-        class Nested3 : Nested1()
-    }
-}
-
-sealed class Base3 {
-    sealed class Nested1 : Base3() {
-        class Nested2 : Nested1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/old.kt
deleted file mode 100644
index 026fe02139b7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/old.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package test
-
-sealed class Base1 {
-    sealed class Nested1 : Base1() {
-        sealed class Nested2 : Nested1()
-    }
-}
-
-sealed class Base2 {
-    sealed class Nested1 : Base2() {
-        class Nested2 : Nested1()
-    }
-}
-
-sealed class Base3 {
-    sealed class Nested1 : Base3() {
-        class Nested2
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out
deleted file mode 100644
index 24ddda10d1c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out
+++ /dev/null
@@ -1,13 +0,0 @@
-ADDED test/Base1.Nested1.Nested2.Nested3
-ADDED test/Base2.Nested1.Nested3
-PROTO DIFFERENCE in test/Base1.Nested1.Nested2: NESTED_CLASS_NAME_LIST, SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base1.Nested1.Nested2: CLASS_SIGNATURE, MEMBERS
-    [Nested3]
-PROTO DIFFERENCE in test/Base2.Nested1: NESTED_CLASS_NAME_LIST, SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base2.Nested1: CLASS_SIGNATURE, MEMBERS
-    [Nested3]
-PROTO DIFFERENCE in test/Base3.Nested1: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base3.Nested1: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Base3.Nested1.Nested2: SUPERTYPE_LIST
-CHANGES in test/Base3.Nested1.Nested2: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base3.Nested1]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/new.kt
deleted file mode 100644
index bc57072314f6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/new.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-sealed class Base1 {
-    class Nested1 : Base1()
-}
-
-sealed class Base2 {
-    class Nested1 : Base2()
-    class Nested2
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/old.kt
deleted file mode 100644
index 17258934aca3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/old.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-sealed class Base1 {
-    class Nested1 : Base1()
-    class Nested2 : Base1()
-}
-
-sealed class Base2 {
-    class Nested1 : Base2()
-    class Nested2 : Base2()
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out
deleted file mode 100644
index c3d779727749..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out
+++ /dev/null
@@ -1,9 +0,0 @@
-REMOVED test/Base1.Nested2
-PROTO DIFFERENCE in test/Base1: NESTED_CLASS_NAME_LIST, SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS
-    [Nested2]
-PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST
-CHANGES in test/Base2: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST
-CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS
-    [kotlin.Any, test.Base2]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/new.kt
deleted file mode 100644
index feddad90bfcc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/new.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-external class ExternalClass {
-    fun addedExternalFun()
-    val addedExternalVal: Int
-}
-
-external class ClassBecameExternal
-class ClassBecameNonExternal
-
-external fun addedExternalFun()
-external val addedExternalVal: Int
-
-external fun funBecameExternal()
-fun funBecameNonExternal() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/old.kt
deleted file mode 100644
index 9a729477c7b9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/old.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-external class ExternalClass {
-    fun removedExternalFun()
-    val removedExternalVal: Int
-}
-
-class ClassBecameExternal
-external class ClassBecameNonExternal
-
-external fun removedExternalFun()
-external val removedExternalVal: Int
-
-fun funBecameExternal() {}
-external fun funBecameNonExternal()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/result.out
deleted file mode 100644
index 756d19153dbc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jsOnly/externals/result.out
+++ /dev/null
@@ -1,10 +0,0 @@
-PROTO DIFFERENCE in test/ClassBecameExternal: FLAGS
-CHANGES in test/ClassBecameExternal: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ClassBecameNonExternal: FLAGS
-CHANGES in test/ClassBecameNonExternal: CLASS_SIGNATURE
-PROTO DIFFERENCE in test/ExternalClass: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/ExternalClass: MEMBERS
-    [addedExternalFun, addedExternalVal, removedExternalFun, removedExternalVal]
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/MainKt: MEMBERS
-    [addedExternalFun, addedExternalVal, funBecameExternal, funBecameNonExternal, removedExternalFun, removedExternalVal]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/new.kt
deleted file mode 100644
index c63738c81cfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/new.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-public fun main() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/old.kt
deleted file mode 100644
index 36ad2f44f6de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public class TestPackage {
-    public fun main() {}
-}
-
-public class MainKt {
-    companion object {
-        @JvmStatic
-        public fun main() {
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/result.out
deleted file mode 100644
index 8ea00e6c8548..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/classToFileFacade/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-REMOVED test/MainKt.Companion
-REMOVED test/TestPackage
-CHANGES in test/MainKt: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/new.kt
deleted file mode 100644
index 5ebb80f3de47..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/new.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-abstract class A {
-    external fun externalFlagAddedFun()
-    fun externalFlagRemovedFun() {}
-    external fun externalFlagUnchangedFun()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/old.kt
deleted file mode 100644
index ad26c6d328f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/old.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-abstract class A {
-    fun externalFlagAddedFun() {}
-    external fun externalFlagRemovedFun()
-    external fun externalFlagUnchangedFun()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/result.out
deleted file mode 100644
index 99d221eacdbc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/membersFlagsChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/A: FUNCTION_LIST
-CHANGES in test/A: MEMBERS
-    [externalFlagAddedFun, externalFlagRemovedFun]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new1.kt
deleted file mode 100644
index 22064b47da07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new1.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-public fun unchangedFun1() {}
-
-public fun publicAddedFun1() {}
-
-private fun addedFun1(): Int = 10
-
-private val addedVal1: String = "A"
-
-private val changedVal1: String = ""
-
-private fun changedFun1(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new2.kt
deleted file mode 100644
index dc7dce428883..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new2.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-public fun unchangedFun2() {}
-
-private fun addedFun2(): Int = 10
-
-private val addedVal2: String = "A"
-
-private val changedVal2: String = ""
-
-private fun changedFun2(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old1.kt
deleted file mode 100644
index 11fff787118b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old1.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-public fun unchangedFun1() {}
-
-private fun removedFun1(): Int = 10
-
-private val removedVal1: String = "A"
-
-private val changedVal1: Int = 20
-
-private fun changedFun1(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old2.kt
deleted file mode 100644
index 2c794b1fbe01..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old2.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-public fun unchangedFun2() {}
-
-private fun removedFun2(): Int = 10
-
-private val removedVal2: String = "A"
-
-private val changedVal2: Int = 20
-
-private fun changedFun2(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out
deleted file mode 100644
index ad6c3735fc7c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out
+++ /dev/null
@@ -1,5 +0,0 @@
-SKIPPED test/Utils
-PROTO DIFFERENCE in test/Utils__Main1Kt: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/Utils__Main1Kt: MEMBERS
-    [publicAddedFun1]
-PROTO DIFFERENCE in test/Utils__Main2Kt: FUNCTION_LIST, PROPERTY_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/new.kt
deleted file mode 100644
index bee5fee69ebe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/new.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public class TestPackage {
-    public fun main() {}
-}
-
-public class MainKt {
-    companion object {
-        @JvmStatic
-        public fun main() {
-        }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/old.kt
deleted file mode 100644
index 81ffc604d8ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/old.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-public fun main() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/result.out
deleted file mode 100644
index aa5d9b93998b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/jvmOnly/packageFacadeToClass/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-ADDED test/MainKt.Companion
-ADDED test/TestPackage
-CHANGES in test/MainKt: CLASS_SIGNATURE
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/new.kt
deleted file mode 100644
index 928941e3ec0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/new.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-fun argumentAdded(x: Int = 1) {}
-fun argumentRemoved() {}
-
-fun valueAdded(x: Int = 3) {}
-fun valueRemoved(x: Int) {}
-fun valueChanged(x: Int = 6) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/old.kt
deleted file mode 100644
index 5b95a0ab6a0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/old.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-fun argumentAdded() {}
-fun argumentRemoved(x: Int = 2) {}
-
-fun valueAdded(x: Int) {}
-fun valueRemoved(x: Int = 4) {}
-fun valueChanged(x: Int = 5) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/result.out
deleted file mode 100644
index 7ddbb07ea533..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/defaultValues/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST
-CHANGES in test/MainKt: MEMBERS
-    [argumentAdded, argumentRemoved, valueAdded, valueRemoved]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/new.kt
deleted file mode 100644
index 51b46517e9a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/new.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-@Ann1
-@Ann2
-fun annotationListBecameNotEmpty() {}
-
-fun annotationListBecameEmpty() {}
-
-@Ann1
-@Ann2
-fun annotationAdded() {}
-
-@Ann1
-fun annotationRemoved() {}
-
-@Ann2
-fun annotationReplaced() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/old.kt
deleted file mode 100644
index 3d39ec4b4098..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test
-
-annotation class Ann1
-annotation class Ann2
-
-fun annotationListBecameNotEmpty() {}
-
-@Ann1
-@Ann2
-fun annotationListBecameEmpty() {}
-
-@Ann1
-fun annotationAdded() {}
-
-@Ann1
-@Ann2
-fun annotationRemoved() {}
-
-@Ann1
-fun annotationReplaced() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result-js.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result-js.out
deleted file mode 100644
index fb07de092534..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result-js.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST
-CHANGES in test/MainKt: MEMBERS
-    [annotationAdded, annotationListBecameEmpty, annotationListBecameNotEmpty, annotationRemoved, annotationReplaced]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result.out
deleted file mode 100644
index 5a48016fb078..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersAnnotationListChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST
-CHANGES in test/MainKt: MEMBERS
-    [annotationListBecameEmpty, annotationListBecameNotEmpty]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/new.kt
deleted file mode 100644
index a2d580358915..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/new.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package test
-
-const val constFlagAddedVal = ""
-val constFlagRemovedVal = ""
-const val constFlagUnchangedVal = ""
-
-external fun externalFlagAddedFun()
-fun externalFlagRemovedFun() {}
-external fun externalFlagUnchangedFun()
-
-@Suppress("INAPPLICABLE_INFIX_MODIFIER")
-infix fun infixFlagAddedFun() {}
-fun infixFlagRemovedFun() {}
-@Suppress("INAPPLICABLE_INFIX_MODIFIER")
-infix fun infixFlagUnchangedFun() {}
-
-inline fun inlineFlagAddedFun() {}
-fun inlineFlagRemovedFun() {}
-inline fun inlineFlagUnchangedFun() {}
-
-internal val internalFlagAddedVal = ""
-val internalFlagRemovedVal = ""
-internal val internalFlagUnchangedVal = ""
-internal fun internalFlagAddedFun() {}
-fun internalFlagRemovedFun() {}
-internal fun internalFlagUnchangedFun() {}
-
-@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-operator fun operatorFlagAddedFun() {}
-fun operatorFlagRemovedFun() {}
-@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-operator fun operatorFlagUnchangedFun() {}
-
-private val privateFlagAddedVal = ""
-val privateFlagRemovedVal = ""
-private val privateFlagUnchangedVal = ""
-private fun privateFlagAddedFun() {}
-fun privateFlagRemovedFun() {}
-private fun privateFlagUnchangedFun() {}
-
-public val publicFlagAddedVal = ""
-val publicFlagRemovedVal = ""
-public val publicFlagUnchangedVal = ""
-public fun publicFlagAddedFun() {}
-fun publicFlagRemovedFun() {}
-public fun publicFlagUnchangedFun() {}
-
-tailrec fun tailrecFlagAddedFun() {}
-fun tailrecFlagRemovedFun() {}
-tailrec fun tailrecFlagUnchangedFun() {}
-
-val noFlagsUnchangedVal = ""
-fun noFlagsUnchangedFun() {}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/old.kt
deleted file mode 100644
index 9799a6414499..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/old.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package test
-
-val constFlagAddedVal = ""
-const val constFlagRemovedVal = ""
-const val constFlagUnchangedVal = ""
-
-fun externalFlagAddedFun() {}
-external fun externalFlagRemovedFun()
-external fun externalFlagUnchangedFun()
-
-fun infixFlagAddedFun() {}
-@Suppress("INAPPLICABLE_INFIX_MODIFIER")
-infix fun infixFlagRemovedFun() {}
-@Suppress("INAPPLICABLE_INFIX_MODIFIER")
-infix fun infixFlagUnchangedFun() {}
-
-fun inlineFlagAddedFun() {}
-inline fun inlineFlagRemovedFun() {}
-inline fun inlineFlagUnchangedFun() {}
-
-val internalFlagAddedVal = ""
-internal val internalFlagRemovedVal = ""
-internal val internalFlagUnchangedVal = ""
-fun internalFlagAddedFun() {}
-internal fun internalFlagRemovedFun() {}
-internal fun internalFlagUnchangedFun() {}
-
-fun operatorFlagAddedFun() {}
-@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-operator fun operatorFlagRemovedFun() {}
-@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
-operator fun operatorFlagUnchangedFun() {}
-
-val privateFlagAddedVal = ""
-private val privateFlagRemovedVal = ""
-private val privateFlagUnchangedVal = ""
-fun privateFlagAddedFun() {}
-private fun privateFlagRemovedFun() {}
-private fun privateFlagUnchangedFun() {}
-
-val publicFlagAddedVal = ""
-public val publicFlagRemovedVal = ""
-public val publicFlagUnchangedVal = ""
-fun publicFlagAddedFun() {}
-public fun publicFlagRemovedFun() {}
-public fun publicFlagUnchangedFun() {}
-
-fun tailrecFlagAddedFun() {}
-tailrec fun tailrecFlagRemovedFun() {}
-tailrec fun tailrecFlagUnchangedFun() {}
-
-val noFlagsUnchangedVal = ""
-fun noFlagsUnchangedFun() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/result.out
deleted file mode 100644
index 81287d37eea4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/membersFlagsChanged/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/MainKt: MEMBERS
-    [constFlagAddedVal, constFlagRemovedVal, externalFlagAddedFun, externalFlagRemovedFun, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/new.kt
deleted file mode 100644
index 9f98bc5a4b9b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/new.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-private fun addedFun(): Int = 10
-
-private val addedVal: String = "A"
-
-private val changedVal: String = ""
-
-private fun changedFun(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/old.kt
deleted file mode 100644
index d84e45cd33e9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/old.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-private fun removedFun(): Int = 10
-
-private val removedVal: String = "A"
-
-private val changedVal: Int = 20
-
-private fun changedFun(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out
deleted file mode 100644
index 8fe203691c2e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out
+++ /dev/null
@@ -1 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST, PROPERTY_LIST
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/new.kt
deleted file mode 100644
index e8d2d04161e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/new.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-public fun addedFun(): Int = 10
-
-public val addedVal: String = "A"
-
-public val changedVal: String = ""
-
-internal fun changedFun(arg: String) {}
-
-private fun privateAddedFun() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/old.kt
deleted file mode 100644
index 70876015aa5e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-public fun removedFun(): Int = 10
-
-public val removedVal: String = "A"
-
-public val changedVal: Int = 20
-
-internal fun changedFun(arg: Int) {}
-
-private fun privateRemovedFun() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/result.out
deleted file mode 100644
index 0757a3f0fe6a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/packageMembers/packageFacadePublicChanges/result.out
+++ /dev/null
@@ -1,3 +0,0 @@
-PROTO DIFFERENCE in test/MainKt: FUNCTION_LIST, PROPERTY_LIST
-CHANGES in test/MainKt: MEMBERS
-    [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/new.kt
deleted file mode 100644
index 0889792a2183..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/new.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package test
-
-class UnchangedClassWithFunOnly {
-    public fun unchangedPublicFun() {}
-    protected fun unchangedProtectedFun() {}
-    internal fun unchangedInternalFun() {}
-    private fun unchangedPrivateFun() {}
-}
-
-class UnchangedClassWithValOnly {
-    public val unchangedPublicVal = 10
-    protected val unchangedProtectedVal = 10
-    internal val unchangedInternalVal = 10
-    private val unchangedPrivateVal = 10
-}
-
-class UnchangedClassWithVarOnly {
-    public var unchangedPublicVar = 20
-    protected var unchangedProtectedVar = 20
-    internal var unchangedInternalVar = 20
-    private var unchangedPrivateVar = 20
-}
-
-class UnchangedClass {
-    public val unchangedPublicVal = 10
-    protected val unchangedProtectedVal = 10
-    internal val unchangedInternalVal = 10
-    private val unchangedPrivateVal = 10
-
-    public var unchangedPublicVar = 20
-    protected var unchangedProtectedVar = 20
-    internal var unchangedInternalVar = 20
-    private var unchangedPrivateVar = 20
-
-    public fun unchangedPublicFun() {}
-    protected fun unchangedProtectedFun() {}
-    internal fun unchangedInternalFun() {}
-    private fun unchangedPrivateFun() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/old.kt
deleted file mode 100644
index 0889792a2183..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/old.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package test
-
-class UnchangedClassWithFunOnly {
-    public fun unchangedPublicFun() {}
-    protected fun unchangedProtectedFun() {}
-    internal fun unchangedInternalFun() {}
-    private fun unchangedPrivateFun() {}
-}
-
-class UnchangedClassWithValOnly {
-    public val unchangedPublicVal = 10
-    protected val unchangedProtectedVal = 10
-    internal val unchangedInternalVal = 10
-    private val unchangedPrivateVal = 10
-}
-
-class UnchangedClassWithVarOnly {
-    public var unchangedPublicVar = 20
-    protected var unchangedProtectedVar = 20
-    internal var unchangedInternalVar = 20
-    private var unchangedPrivateVar = 20
-}
-
-class UnchangedClass {
-    public val unchangedPublicVal = 10
-    protected val unchangedProtectedVal = 10
-    internal val unchangedInternalVal = 10
-    private val unchangedPrivateVal = 10
-
-    public var unchangedPublicVar = 20
-    protected var unchangedProtectedVar = 20
-    internal var unchangedInternalVar = 20
-    private var unchangedPrivateVar = 20
-
-    public fun unchangedPublicFun() {}
-    protected fun unchangedProtectedFun() {}
-    internal fun unchangedInternalFun() {}
-    private fun unchangedPrivateFun() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/result.out
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedClass/result.out
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/new.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/new.kt
deleted file mode 100644
index 0625597c878e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/new.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-private fun unchangedPrivateFun(): Int = 10
-
-public val unchangedVal: Int = 10
-
-public var unchangedVar: Int = 20
-
-private val unchangedPrivateVal: Int = 10
-
-private var unchangedPrivateVar: Int = 20
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/old.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/old.kt
deleted file mode 100644
index 0625597c878e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-public fun unchangedFun() {}
-
-private fun unchangedPrivateFun(): Int = 10
-
-public val unchangedVal: Int = 10
-
-public var unchangedVar: Int = 20
-
-private val unchangedPrivateVal: Int = 10
-
-private var unchangedPrivateVar: Int = 20
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/result.out b/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/result.out
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/comparison/unchanged/unchangedPackageFacade/result.out
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml
deleted file mode 100644
index a441b33e10b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/src/src.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/src/src.kt
deleted file mode 100644
index a35e5b251818..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/src/src.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-fun foo() { }
-
-internal fun internalBar() {}
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation()
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFunctionAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/test/test.kt
deleted file mode 100644
index 9d74548c0582..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/AccessToInternalInProductionFromTests/test/test.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-@file:InternalFileAnnotation
-
-@InternalFunctionAnnotation
-fun test() {
-  foo()
-  internalBar()
-
-  @InternalClassAnnotation
-  class Local {
-    @InternalFunctionAnnotation
-    fun foo() {}
-  }
-}
-
-@InternalClassAnnotation
-class Class {
-  @InternalFunctionAnnotation
-  fun foo() {}
-
-  @InternalClassAnnotation
-  class Nested {
-    @InternalFunctionAnnotation
-    fun foo() {}
-  }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/src/Bar.kt
deleted file mode 100644
index 2c990ada4c74..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CancelKotlinCompilation/src/Bar.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class Bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/src/utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/src/utils.kt
deleted file mode 100644
index 30a676017411..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CheckIsCancelledIsCalledOftenEnough/src/utils.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun square(a: Int): Int = a*a
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.iml
deleted file mode 100644
index 5559c7ad9190..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-    <orderEntry type="module" module-name="module2" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.ipr
deleted file mode 100644
index 03619a4f72c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/module2.iml
deleted file mode 100644
index eace69878a29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/JSecond.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/JSecond.java
deleted file mode 100644
index e034bf387926..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/JSecond.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JSecond {
-    public static void main(String[] args) {
-        new JFirst().foo();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/kt1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/kt1.kt
deleted file mode 100644
index 90c4941858e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/module2/src/kt1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package kt1
-
-fun foo() {}
-
-fun bar() {
-    kt2.bar()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/JFirst.java
deleted file mode 100644
index 12140d2a7e44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/JFirst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-public class JFirst {
-    JSecond s = null;
-
-    public void foo() {
-
-    }
-
-    public static void main(String[] args) {
-        System.out.println(1);
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/kt2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/kt2.kt
deleted file mode 100644
index 96dfcda26c4c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesDifferentPackages/src/kt2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package kt2
-
-fun foo() {
-    kt1.foo()
-}
-
-fun bar() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
deleted file mode 100644
index 109a31fe488c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14
-'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
-'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
-'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15
-Cannot access 'InternalClass1': it is internal in 'test' at line 5, column 13
-Cannot access 'InternalClass1': it is internal in 'test' at line 8, column 36
-Cannot access 'InternalClass2': it is internal in 'test' at line 19, column 15
-Cannot access 'InternalClassAnnotation': it is internal in 'test' at line 10, column 2
-Cannot access 'InternalFileAnnotation': it is internal in 'test' at line 1, column 7
-Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml
deleted file mode 100644
index c9205eae7622..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt
deleted file mode 100644
index 9a7bdb153a3d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package test
-
-internal open class InternalClass1
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation()
-
-abstract class ClassA1(internal val member: Int)
-
-abstract class ClassB1 {
-    internal abstract val member: Int
-}
-
-class ClassD: InternalClass2()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml
deleted file mode 100644
index ecdc9e147ae7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt
deleted file mode 100644
index e7ebf8914c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-internal open class InternalClass2
-
-abstract class ClassA2(internal val member: Int)
-
-abstract class ClassB2 {
-    internal abstract val member: Int
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt
deleted file mode 100644
index ece01121bd2c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-@file:InternalFileAnnotation
-
-package test
-
-import test.InternalClass1
-
-// InternalClass1, ClassA1, ClassB1 are in module1
-class ClassInheritedFromInternal1: InternalClass1()
-
-@InternalClassAnnotation
-class ClassAA1 : ClassA1(10)
-
-class ClassBB1 : ClassB1() {
-    internal override val member = 10
-}
-
-// InternalClass2, ClassA2, ClassB2 are in module2
-class ClassInheritedFromInternal2: InternalClass2()
-
-class ClassAA2 : ClassA2(10)
-
-class ClassBB2 : ClassB2() {
-    internal override val member = 10
-}
-
-fun f() {
-    val x1 = ClassAA1().member
-    val x2 = ClassAA2().member
-}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml
deleted file mode 100644
index 5559c7ad9190..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-    <orderEntry type="module" module-name="module2" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr
deleted file mode 100644
index 809737b0b761..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml
deleted file mode 100644
index eace69878a29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java
deleted file mode 100644
index e034bf387926..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JSecond {
-    public static void main(String[] args) {
-        new JFirst().foo();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java
deleted file mode 100644
index 12140d2a7e44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-public class JFirst {
-    JSecond s = null;
-
-    public void foo() {
-
-    }
-
-    public static void main(String[] args) {
-        System.out.println(1);
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/module1.iml
deleted file mode 100644
index c9205eae7622..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/module1.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/src/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/src/a.kt
deleted file mode 100644
index 8311da660123..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module1/src/a.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-fun a() {
-
-}
-
-val a = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/module2.iml
deleted file mode 100644
index ecdc9e147ae7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/src/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/src/b.kt
deleted file mode 100644
index b04c387135d0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackage/module2/src/b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-fun b() {
-
-}
-
-var b = b()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml
deleted file mode 100644
index a28a2f8285e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt
deleted file mode 100644
index 4da8772ebba2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun a() {
-
-}
-
-internal fun funA() {}
-
-val a = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt
deleted file mode 100644
index e3526b4ac215..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-internal fun testFunA() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt
deleted file mode 100644
index 028f7dbaa665..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun foo() {
-    funA()
-    testFunA()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml
deleted file mode 100644
index a2e977d345bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt
deleted file mode 100644
index 395d5075411a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun b() {
-
-}
-
-internal fun funB() {}
-
-var b = b()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt
deleted file mode 100644
index d6360452cef7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-internal fun testFunB() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt
deleted file mode 100644
index b2dc2d251199..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun bar() {
-    funB()
-    testFunB()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
deleted file mode 100644
index 24037a41f50d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Cannot access 'funA': it is internal in 'test' at line 4, column 5
-Cannot access 'funB': it is internal in 'test' at line 4, column 5
-Cannot access 'testFunA': it is internal in 'test' at line 5, column 5
-Cannot access 'testFunB': it is internal in 'test' at line 5, column 5
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml
deleted file mode 100644
index a28a2f8285e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt
deleted file mode 100644
index 4da8772ebba2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun a() {
-
-}
-
-internal fun funA() {}
-
-val a = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt
deleted file mode 100644
index e3526b4ac215..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-internal fun testFunA() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt
deleted file mode 100644
index fb8416d39d31..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun foo() {
-    funB()
-    testFunB()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml
deleted file mode 100644
index a2e977d345bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt
deleted file mode 100644
index 395d5075411a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun b() {
-
-}
-
-internal fun funB() {}
-
-var b = b()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt
deleted file mode 100644
index d6360452cef7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-internal fun testFunB() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt
deleted file mode 100644
index e9ce5c96421e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun bar() {
-    funA()
-    testFunA()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml
deleted file mode 100644
index e9637fef0b30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java
deleted file mode 100644
index 6bec9cbc7a68..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1;
-
-public class JavaClass {
-    public static void newJavaMethod() {}
-    public static void oldJavaMethod() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt
deleted file mode 100644
index eed0941fbaf3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package module1
-
-import module2.*
-
-fun foo() {
-    JavaClass.oldJavaMethod()
-    JavaClass.newJavaMethod()
-
-    KotlinObject.oldKotlinMethod()
-    KotlinObject.newKotlinMethod()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml
deleted file mode 100644
index bdec3f1d34ac..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt
deleted file mode 100644
index fa757e1de93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package module2
-
-public object KotlinObject {
-    public fun oldKotlinMethod() {
-    }
-
-    public fun newKotlinMethod() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt
deleted file mode 100644
index 10ecb462c1d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package module2
-
-import module1.*
-
-fun bar() {
-    JavaClass.oldJavaMethod()
-    JavaClass.newJavaMethod()
-
-    KotlinObject.oldKotlinMethod()
-    KotlinObject.newKotlinMethod()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
deleted file mode 100644
index 3ee75e14976a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package lib.module1;
-
-public class JavaClass {
-    public static void oldJavaMethod() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
deleted file mode 100644
index 2d7a7f20b33a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package lib.module1
-
-import lib.module2.*
-
-fun foo() {
-    JavaClass.oldJavaMethod()
-
-    KotlinObject.oldKotlinMethod()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
deleted file mode 100644
index cb5a7f55c777..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package lib.module2
-
-public object KotlinObject {
-    public fun oldKotlinMethod() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
deleted file mode 100644
index ff5c408f39b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package lib.module2
-
-import lib.module1.*
-
-fun bar() {
-    JavaClass.oldJavaMethod()
-
-    KotlinObject.oldKotlinMethod()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/src/test1.kt
deleted file mode 100644
index d68bb3a92eef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CodeInKotlinPackage/src/test1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package kotlin.forever
-
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.iml
deleted file mode 100644
index 6d20898bff37..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/customOut/" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="$MODULE_DIR$/customOut/"/>
-
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/src/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/src/A.kt
deleted file mode 100644
index fb7337ede5b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/CustomDestination/src/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.iml
deleted file mode 100644
index d04ecd6e02e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.ipr
deleted file mode 100644
index 001ea3380cd4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="KotlinCommonCompilerArguments">
-    <option name="apiVersion" value="1.1" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/src/main.kt
deleted file mode 100644
index bf1bc16df8e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DefaultLanguageVersionCustomApiVersion/src/main.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    arrayListOf(1, 2, 3).fill(0)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr
deleted file mode 100644
index d324e31411dd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module/module.iml" filepath="$PROJECT_DIR$/module/module.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/module.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/module.iml
deleted file mode 100644
index eff2a2bb0bff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/module.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
deleted file mode 100644
index 3314395f7377..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package module
-
-public interface  A {
-    fun oldFun(): Int = 1
-    fun newFun(): Int = 42
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt
deleted file mode 100644
index 80f01b0be858..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package module
-
-public class B(private val c: C) {
-    fun foo() {
-        val a = c.getA()
-        a.oldFun()
-        a.newFun()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/C.java
deleted file mode 100644
index 0716f11da8f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/module/src/module/C.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package module;
-
-public interface C {
-    A getA();
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
deleted file mode 100644
index a54a95697878..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package module
-
-public interface A {
-    fun oldFun(): Int = 1
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt
deleted file mode 100644
index 74aad6e1f3f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package module
-
-public class B(private val c: C) {
-    fun foo() {
-        val a = c.getA()
-        a.oldFun()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java
deleted file mode 100644
index 0716f11da8f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package module;
-
-public interface C {
-    A getA();
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.iml
deleted file mode 100644
index e025b203cd57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.ipr
deleted file mode 100644
index cacdb365adc8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/kotlinProject.ipr
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager"
-             version="2"
-             languageLevel="JDK_1_6"
-             default="true"
-             project-jdk-name="IntelliJ IDEA"
-             project-jdk-type="IDEA JDK" >
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/resources/META-INF/plugin.xml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/resources/META-INF/plugin.xml
deleted file mode 100644
index 736cd1df218b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<idea-plugin>
-  <id>com.your.company.unique.plugin.id</id>
-  <name>Plugin display name here</name>
-  <version>1.0</version>
-  <vendor email="support@yourcompany.com" url="https://www.yourcompany.com">YourCompany</vendor>
-
-  <description><![CDATA[
-      Enter short description for your plugin here.<br>
-      <em>most HTML tags may be used</em>
-    ]]></description>
-
-  <change-notes><![CDATA[
-      Add change notes here.<br>
-      <em>most HTML tags may be used</em>
-    ]]>
-  </change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-  <idea-version since-build="173.0"/>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-  </extensions>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
-</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/src/test.kt
deleted file mode 100644
index adb5b33c5731..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DevKitProject/src/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml
deleted file mode 100644
index a441b33e10b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java
deleted file mode 100644
index 9afa4b2097cd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java
+++ /dev/null
@@ -1,2 +0,0 @@
-class Src {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt
deleted file mode 100644
index c133c83fce7a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-    val x = 5 + 5
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml
deleted file mode 100644
index 3b1ba79ed612..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr
deleted file mode 100644
index 809737b0b761..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml
deleted file mode 100644
index eace69878a29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java
deleted file mode 100644
index 66dd24ce6750..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class B {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java
deleted file mode 100644
index 61ff2abcc95e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class A {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt
deleted file mode 100644
index 67d276629bfd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun f(): String = "f()"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.iml
deleted file mode 100644
index d04ecd6e02e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Bar.kt
deleted file mode 100644
index f577138fb1ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Bar.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class Bar() {
-    fun bar() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Foo.kt
deleted file mode 100644
index 494c3dea241d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/EAPToReleaseIC/src/Foo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Foo() {
-    fun foo() {
-        Bar().bar()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr
deleted file mode 100644
index da39ecb6ab25..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <file url="file://$PROJECT_DIR$/src/Excluded.kt" />
-      <file url="file://$PROJECT_DIR$/src/dir/YetAnotherExcluded.kt" />
-    </excludeFromCompile>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt
deleted file mode 100644
index 06d7528e2289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Excluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt
deleted file mode 100644
index 4b5f5c0c428c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class YetAnotherExcluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt
deleted file mode 100644
index 4a643c4dde8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml
deleted file mode 100644
index 54f25b2ccece..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/src/exclude"/>
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt
deleted file mode 100644
index 06d7528e2289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Excluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderInSourceRoot/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr
deleted file mode 100644
index 852485b023c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/src/dir" includeSubdirectories="false" />
-      <file url="file://$PROJECT_DIR$/src/dir/Excluded.kt" />
-      <file url="file://$PROJECT_DIR$/src/dir/subdir/YetAnotherExcluded.kt" />
-    </excludeFromCompile>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt
deleted file mode 100644
index 06d7528e2289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Excluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt
deleted file mode 100644
index 4b5f5c0c428c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class YetAnotherExcluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt
deleted file mode 100644
index 4a643c4dde8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr
deleted file mode 100644
index 9b497ed5475d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/src/exclude" includeSubdirectories="true" />
-    </excludeFromCompile>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt
deleted file mode 100644
index 4a643c4dde8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt
deleted file mode 100644
index 06d7528e2289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Excluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt
deleted file mode 100644
index 4b5f5c0c428c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class YetAnotherExcluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt
deleted file mode 100644
index 06d7528e2289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Excluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt
deleted file mode 100644
index 4b5f5c0c428c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt
+++ /dev/null
@@ -1 +0,0 @@
-class YetAnotherExcluded
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml
deleted file mode 100644
index 5cff40145f7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/src/module2" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr
deleted file mode 100644
index 35b084995b69..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/src/module2/module2.iml" filepath="$PROJECT_DIR$/src/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml
deleted file mode 100644
index 3b1ba79ed612..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/kotlinProject.ipr
deleted file mode 100644
index 04d418ca1792..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module.iml" filepath="$PROJECT_DIR$/module.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/module.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/module.iml
deleted file mode 100644
index 4c925d6cab75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/module.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/src/Bar.kt
deleted file mode 100644
index 2c990ada4c74..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/FileDoesNotExistWarning/src/Bar.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class Bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/expected.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/expected.txt
deleted file mode 100644
index 19377f83f9f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/expected.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-Targets dependent on Module 'a' production:
-Module 'a' tests
-Module 'b' production
-Module 'b' tests
-Module 'b2' production
-Module 'b2' tests
-Module 'c' production
-Module 'c' tests
----------
-Targets dependent on Module 'a' tests:
-Module 'b' tests
-Module 'b2' tests
-Module 'c' tests
----------
-Targets dependent on Module 'b2' production:
-Module 'b2' tests
-Module 'c2' production
-Module 'c2' tests
----------
-Targets dependent on Module 'b2' tests:
-Module 'c2' tests
----------
-Targets dependent on Module 'c2' production:
-Module 'c2' tests
----------
-Targets dependent on Module 'c2' tests:
-
----------
-Targets dependent on Module 'b' production:
-Module 'b' tests
-Module 'c' production
-Module 'c' tests
----------
-Targets dependent on Module 'b' tests:
-Module 'c' tests
----------
-Targets dependent on Module 'c' production:
-Module 'c' tests
----------
-Targets dependent on Module 'c' tests:
-
----------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/src/foo.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/src/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/test/test.kt
deleted file mode 100644
index 839220d10022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/GetDependentTargets/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.ipr
deleted file mode 100644
index 102bdf0ea206..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="KotlinCompilerSettings">
-    <option name="additionalArguments" value="-help" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/src/test.kt
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/Help/src/test.kt
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/errors.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/errors.txt
deleted file mode 100644
index a0692a545372..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14
-'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36
-'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36
-Cannot access 'InternalClass1': it is internal in 'test' at line 5, column 13
-Cannot access 'InternalClass1': it is internal in 'test' at line 8, column 36
-Cannot access 'InternalClassAnnotation': it is internal in 'test' at line 10, column 2
-Cannot access 'InternalTestAnnotation': it is internal in 'test' at line 1, column 7
-Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/module1.iml
deleted file mode 100644
index 3b1ba79ed612..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/src/module1.kt
deleted file mode 100644
index e2fc0309302f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module1/src/module1.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package test
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalTestAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation()
-
-private class PrivateClass1
-
-internal open class InternalClass1
-
-abstract class ClassA1(internal val member: Int)
-
-abstract class ClassB1 {
-    internal abstract val member: Int
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/module2.iml
deleted file mode 100644
index ecdc9e147ae7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/additional.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/additional.kt
deleted file mode 100644
index e7ebf8914c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/additional.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-internal open class InternalClass2
-
-abstract class ClassA2(internal val member: Int)
-
-abstract class ClassB2 {
-    internal abstract val member: Int
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/module2.kt
deleted file mode 100644
index 155a4c3a341a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromAnotherModule/module2/src/module2.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-@file:InternalTestAnnotation
-
-package test
-
-import test.InternalClass1
-
-// InternalClass1, ClassA1, ClassB1 are in module1
-class ClassInheritedFromInternal1: InternalClass1()
-
-@InternalClassAnnotation
-class ClassAA1 : ClassA1(10)
-
-class ClassBB1 : ClassB1() {
-    internal override val member = 10
-}
-
-// InternalClass2, ClassA2, ClassB2 are in module2
-class ClassInheritedFromInternal2: InternalClass2()
-
-class ClassAA2 : ClassA2(10)
-
-class ClassBB2 : ClassB2() {
-    internal override val member = 10
-}
-
-fun f() {
-    val x1 = ClassAA1().member
-    val x2 = ClassAA2().member
-}
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml
deleted file mode 100644
index 3b1ba79ed612..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt
deleted file mode 100644
index 830308321e16..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package test1
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation1()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation1()
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFunctionAnnotation1()
-
-internal open class InternalClass1
-
-abstract class ClassA1(internal val member: Int)
-
-abstract class ClassB1 {
-    internal abstract val member: Int
-    internal fun func() = 1
-}
-
-internal val internalProp = 1
-
-internal fun internalFun() {}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml
deleted file mode 100644
index 427f7bce96f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="module1" />
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt
deleted file mode 100644
index 22519ed79af8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-@file:InternalFileAnnotation1
-
-package test2
-
-import test1.*
-
-internal class FromInternalClass1: InternalClass1()
-
-@InternalClassAnnotation1
-class FromClassA1 : ClassA1(10) {
-    @InternalClassAnnotation1
-    class Nested {
-        @InternalFunctionAnnotation1
-        fun foo() {}
-    }
-}
-
-class FromClassB1 : ClassB1() {
-    internal override val member = 10
-}
-
-@InternalFunctionAnnotation1
-fun foo() {}
-
-fun box() {
-    internalProp
-    internalFun()
-
-    InternalClass1()
-    FromClassA1().member
-    FromClassB1().member
-    FromClassB1().func()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.iml
deleted file mode 100644
index 5d6f3a178636..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JFirst.java
deleted file mode 100644
index 681465bd981b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JFirst.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java;
-
-public class JFirst {
-    public void foo() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JSecond.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JSecond.java
deleted file mode 100644
index 8642080e27ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/java/JSecond.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java;
-
-public class JSecond extends kt.KFirst {
-    public void bar() {
-        foo();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt
deleted file mode 100644
index 0b2d2794572d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package kt
-
-open class KFirst(): java.JFirst() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.iml
deleted file mode 100644
index 10db71f5cd21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JFirst.java
deleted file mode 100644
index bcdc7cbd4f7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JFirst.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java;
-
-public class JFirst {
-    public void foo() {
-       new myproject.kotlin.KFirst().foo();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JSecond.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JSecond.java
deleted file mode 100644
index 8d1269648422..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/java/JSecond.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java;
-
-public class JSecond {
-    public void foo() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/kotlin/KFirst.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/kotlin/KFirst.kt
deleted file mode 100644
index d3f96de0f7f9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JKJProject/src/kotlin/KFirst.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package myproject.kotlin
-
-class KFirst() {
-    fun foo() {
-        java.JSecond().foo()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/Foo.kt
deleted file mode 100644
index 5ff6c09c578b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/Foo.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/main.kt
deleted file mode 100644
index 27c36e10d47b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/JpsDaemonIC/src/main.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main() {
-    Foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.iml
deleted file mode 100644
index d04ecd6e02e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/java/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/java/JFirst.java
deleted file mode 100644
index 5f400f485625..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/java/JFirst.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package java;
-
-public class JFirst {
-    public void foo() {
-        new myproject.kotlin.KFirst().foo();
-    }
-
-    public void bar() {
-        new myproject.kotlin.KFirst().bar();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/kotlin/KFirst.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/kotlin/KFirst.kt
deleted file mode 100644
index 0641836f93f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJCircularProject/src/kotlin/KFirst.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package myproject.kotlin
-
-class KFirst() {
-    fun foo() {
-        java.JFirst().bar()
-    }
-
-    fun bar() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.iml
deleted file mode 100644
index 864e89613d79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/java/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/java/JFirst.java
deleted file mode 100644
index 987a57773329..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/java/JFirst.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package java;
-
-public class JFirst extends kt.KFirst {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt
deleted file mode 100644
index 8a5eaf4c6de9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package kt
-
-open class KFirst() {
-    fun foo() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt
deleted file mode 100644
index a36c93094f33..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package kt
-
-class KSecond(): java.JFirst() {
-    fun bar() {
-        foo()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.iml
deleted file mode 100644
index 864e89613d79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/java/JFirst.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/java/JFirst.java
deleted file mode 100644
index 1f4b4e26910b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/java/JFirst.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java;
-
-public class JFirst {
-    public void foo() {
-        new myproject.kotlin.KSecond().foo();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KFirst.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KFirst.kt
deleted file mode 100644
index 536328b73dcc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KFirst.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package myproject.kotlin
-
-class KFirst() {
-    fun foo() {
-        java.JFirst().foo()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KSecond.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KSecond.kt
deleted file mode 100644
index af0f67ec98fc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KJKProject/src/kotlin/KSecond.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package myproject.kotlin
-
-class KSecond() {
-    fun foo() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.iml
deleted file mode 100644
index d04ecd6e02e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/Test.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/Test.java
deleted file mode 100644
index 1c47016bd6d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/Test.java
+++ /dev/null
@@ -1,6 +0,0 @@
-import test.*;
-class A {
-    public static void main(String[] args) {
-       new Foo().foo();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/kotlinFile.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/kotlinFile.kt
deleted file mode 100644
index cdf55aa68be8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaProject/src/kotlinFile.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Foo() {
-    fun foo() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/expected-output.txt
deleted file mode 100644
index ab908429b529..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/expected-output.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    package1/
-      package1.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    kotlin.js
-    kotlin.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class1.kt
deleted file mode 100644
index 0e406383c527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package package1
-
-class Class1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class2.kt
deleted file mode 100644
index 7df6ade3cc89..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptChangePackage/src/Class2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package package2
-
-class Class2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/kotlinProject.ipr
deleted file mode 100644
index c1a403dd047f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/module1.iml
deleted file mode 100644
index 3b1ba79ed612..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/src/foo.kt
deleted file mode 100644
index 830308321e16..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module1/src/foo.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package test1
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation1()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation1()
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFunctionAnnotation1()
-
-internal open class InternalClass1
-
-abstract class ClassA1(internal val member: Int)
-
-abstract class ClassB1 {
-    internal abstract val member: Int
-    internal fun func() = 1
-}
-
-internal val internalProp = 1
-
-internal fun internalFun() {}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/module2.iml
deleted file mode 100644
index 3535f0fb297e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/module2.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../out/" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="module1" />
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/test/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/test/bar.kt
deleted file mode 100644
index 22519ed79af8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptInternalFromSpecialRelatedModule/module2/test/bar.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-@file:InternalFileAnnotation1
-
-package test2
-
-import test1.*
-
-internal class FromInternalClass1: InternalClass1()
-
-@InternalClassAnnotation1
-class FromClassA1 : ClassA1(10) {
-    @InternalClassAnnotation1
-    class Nested {
-        @InternalFunctionAnnotation1
-        fun foo() {}
-    }
-}
-
-class FromClassB1 : ClassB1() {
-    internal override val member = 10
-}
-
-@InternalFunctionAnnotation1
-fun foo() {}
-
-fun box() {
-    internalProp
-    internalFun()
-
-    InternalClass1()
-    FromClassA1().member
-    FromClassB1().member
-    FromClassB1().func()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/expected-output.txt
deleted file mode 100644
index 541f661545ef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/expected-output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    kotlin.js
-    kotlin.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/src/test1.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProject/src/test1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/assets/resource.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/assets/resource.txt
deleted file mode 100644
index 30d74d258442..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/assets/resource.txt
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/expected-output.txt
deleted file mode 100644
index ed929602d07f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/expected-output.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    kotlin.js
-    kotlin.meta.js
-  resource.txt
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.iml
deleted file mode 100644
index 2bc538784965..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" type="kotlin-source" />
-      <sourceFolder url="file://$MODULE_DIR$/assets" type="kotlin-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaScript" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.ipr
deleted file mode 100644
index cfe9e11ba2e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" project-jdk-name="Kotlin SDK" project-jdk-type="KotlinSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/src/Main.kt
deleted file mode 100644
index 174582e286cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectNewSourceRootTypes/src/Main.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    println("Hello")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/expected-output.txt
deleted file mode 100644
index 2d80d94ec34a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/expected-output.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-my_js/
-  lib/
-    kotlin.js
-    kotlin.meta.js
-  myproject/
-    root-package.kjsm
-  myproject.js
-  myproject.meta.js
-my_test-js/
-  lib/
-    kotlin.js
-    kotlin.meta.js
-  myproject-tests/
-    root-package.kjsm
-  myproject-tests.js
-  myproject-tests.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.iml
deleted file mode 100644
index 2b070ee7b93b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-      <facet type="kotlin-language" name="Kotlin">
-        <configuration version="3" platform="JavaScript " useProjectSettings="false">
-          <productionOutputPath>$MODULE_DIR$/target/my_js/myproject.js</productionOutputPath>
-          <testOutputPath>$MODULE_DIR$/target/my_test-js/myproject-tests.js</testOutputPath>
-          <compilerSettings />
-          <compilerArguments>
-            <option name="sourceMapPrefix" value="" />
-            <option name="sourceMapEmbedSources" value="inlining" />
-            <option name="pluginOptions">
-              <array />
-            </option>
-            <option name="pluginClasspaths">
-              <array />
-            </option>
-          </compilerArguments>
-        </configuration>
-      </facet>
-    </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main.kt
deleted file mode 100644
index adb5b33c5731..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main/kotlin/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main/kotlin/main.kt
deleted file mode 100644
index adb5b33c5731..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/main/kotlin/main.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/test/kotlin/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/test/kotlin/test.kt
deleted file mode 100644
index 442858bd7b3d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithCustomOutputPaths/src/test/kotlin/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt
deleted file mode 100644
index b0ae98fc0c7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/expected-output.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    META-INF-ex/
-      file2.js
-    dir/
-      file1.js
-    file0.js
-    jslib-example.js
-    jslib-example.meta.js
-    kotlin.js
-    kotlin.meta.js
-    res0.js
-    resdir/
-      res1.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt
deleted file mode 100644
index 28569346084a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package library.sample
-
-public fun pairAdd(p: Pair<Int, Int>): Int = p.first + p.second
-
-public fun pairMul(p: Pair<Int, Int>): Int = p.first * p.second
-
-public data class IntHolder(val value: Int)
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js
deleted file mode 100644
index fa48e44e0bda..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js
+++ /dev/null
@@ -1 +0,0 @@
-// file2.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF
deleted file mode 100644
index 9ed17555cdc8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.9.1
-Created-By: 1.7.0_72-b14 (Oracle Corporation)
-Built-By: JetBrains
-Implementation-Vendor: JetBrains
-Implementation-Version: snapshot
-Specification-Title: Kotlin JavaScript Lib
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js
deleted file mode 100644
index 909c0013f889..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js
+++ /dev/null
@@ -1 +0,0 @@
-// ignored0.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js
deleted file mode 100644
index 3bccb9f32290..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js
+++ /dev/null
@@ -1 +0,0 @@
-// ignored1.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js
deleted file mode 100644
index 198bed926950..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js
+++ /dev/null
@@ -1 +0,0 @@
-// file4.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js
deleted file mode 100644
index e69df221fdd9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js
+++ /dev/null
@@ -1 +0,0 @@
-// res0.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js
deleted file mode 100644
index feb4eaecdb3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js
+++ /dev/null
@@ -1 +0,0 @@
-// res1.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md
deleted file mode 100644
index 9e82278e7561..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# jslib-example
-
-Path to sources: `compiler/testData/cli/js/jslib`
-
-The archive compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after
-changing some files in source folder.
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js
deleted file mode 100644
index 4b868025b441..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js
+++ /dev/null
@@ -1 +0,0 @@
-// file1.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js
deleted file mode 100644
index a269fd47e903..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js
+++ /dev/null
@@ -1 +0,0 @@
-// file0.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js
deleted file mode 100644
index 68154be1e354..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js
+++ /dev/null
@@ -1,44 +0,0 @@
-if (typeof kotlin === 'undefined') {
-  throw new Error("Error loading module 'LibraryExample'. Its dependency 'kotlin' was not found. Please, check whether 'kotlin' is loaded prior to 'LibraryExample'.");
-}
-var LibraryExample = function (_, Kotlin) {
-  'use strict';
-  function pairAdd(p) {
-    return p.first + p.second | 0;
-  }
-  function pairMul(p) {
-    return Kotlin.imul(p.first, p.second);
-  }
-  function IntHolder(value) {
-    this.value = value;
-  }
-  IntHolder.$metadata$ = {
-    kind: Kotlin.Kind.CLASS,
-    simpleName: 'IntHolder',
-    interfaces: []
-  };
-  IntHolder.prototype.component1 = function () {
-    return this.value;
-  };
-  IntHolder.prototype.copy_za3lpa$ = function (value) {
-    return new IntHolder(value === void 0 ? this.value : value);
-  };
-  IntHolder.prototype.toString = function () {
-    return 'IntHolder(value=' + Kotlin.toString(this.value) + ')';
-  };
-  IntHolder.prototype.hashCode = function () {
-    var result = 0;
-    result = result * 31 + Kotlin.hashCode(this.value) | 0;
-    return result;
-  };
-  IntHolder.prototype.equals = function (other) {
-    return this === other || (other !== null && (typeof other === 'object' && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))));
-  };
-  var package$library = _.library || (_.library = {});
-  var package$sample = package$library.sample || (package$library.sample = {});
-  package$sample.pairAdd_1fzo63$ = pairAdd;
-  package$sample.pairMul_1fzo63$ = pairMul;
-  package$sample.IntHolder = IntHolder;
-  Kotlin.defineModule('LibraryExample', _);
-  return _;
-}(typeof LibraryExample === 'undefined' ? {} : LibraryExample, kotlin);
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js
deleted file mode 100644
index 5dd2ffc566e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js
+++ /dev/null
@@ -1 +0,0 @@
-// Kotlin.kotlin_module_metadata(1, "LibraryExample", "H4sIAAAAAAAAAJVW227TQBB1fF1Pb64LJTUgRBEgbiWkCIEESC19KJWQgIoPcJ1tsqmzG9ZO0v4Ar0h9QP2UfAGf0N+BcS5O0tRu6gfvaHdmzlzOjq2490FxFa94Rv4Nn0LXHsmnRHE9sMD49oOz2NVBdRTPPCNK11aSs4cwD+aRiEPGQWXChUQBdKI4hUQNffVcvIabqZol6WFIgxjUeuQ6I318Fxw1sVK7tjp0rtf9tg96K2ZhlvOXsJo6n6fHTSpZg/LYzzToBV3/2aLyBNQWy1J7BzdAE7IKWmczAK0iGqAFUeSuXowZ36qjJaZa19YS0yfgpCGZ0udVGmWh7MNGqgqBkAJT5TSazASA8VgyHrFgJvwNWBoP/bgm8yv9CBbSIJJEr1OSlgxnCakIRs90mkO3gQzbMX34AGCEmBXWxhi95gLRaPqSRYJn1vw5rKT6dkQRmgfZHXqBSacdakqBbYlZtvqFYMKE6ywnmAn3IwLkXaVeQayjmhRcRGB06EE1zG/wZY2L2tVZGvcebl00NWkbaTkTEycGRD0zqx4H+mrTHNgcq1AP3zhosbCSn/FTWJ4aOVnobyZSnMMGHwrZ8JEU+RjPwE0xCN5QKnn21NmC9asvej7ebw3+FMAK2YH0cXaZkd9ohhTszzzeFWGFylGZtvgJGG0/bFHQ8DhBbDQFR5BXoAeiidbIez+MwNoWIqQ+B0PENXRBan5U+yQqFEgs9pOpUwVzsFpNn8mtSgUKTdC/otzf+dIK3Y9jgZtJ4EUFdzSUNUdHOVnNwQqDdXGwLhcVb8e76yx5askou47jLbq6i3L/XSJdouCxm3Pcr/M6I79IUS2rJX2buKZjJBZ7tmMl6+5fbW/FISiqZYI8NfqbBdy0UTTLxJnz9GKhpO+ea2g03zs/L6C4gKKF4veBSwQ8JSpMDdpkdM7OygMpOhGVWYR5C2tjvhe4iNkhC/z+MMlFKSHKyNI4pHFQy7d4DIuTUyUrqERxmIAe0+PMOzXxSam3Mz8pd8BOGT199T9A8eLwQcbJCMk4y/Qp46AfmVsdIY+ovGbxWEivsFgDs/+fMh3/Dty79MdnbFzMkMbEJ8LnyIQeCzJK6g1U/wOSAB0W3QkAAA==");
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm
deleted file mode 100644
index f53578c8ac0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt
deleted file mode 100644
index ee0be644f223..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import library.sample.pairAdd
-
-fun foo() {
-    val p = Pair(10, 20)
-    val x = pairAdd(p)
-    println("x=$x")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt
deleted file mode 100644
index 541f661545ef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/expected-output.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    kotlin.js
-    kotlin.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml
deleted file mode 100644
index 9e63df535372..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml
deleted file mode 100644
index 966eb57b22c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml
deleted file mode 100644
index 5f2d0c9a4295..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="emptySrc" />
-    <orderEntry type="module" module-name="missingSrc" />
-    <orderEntry type="module" module-name="emptyTests" />
-    <orderEntry type="module" module-name="missingTests" />
-    <orderEntry type="module" module-name="srcEmptyTests" />
-    <orderEntry type="module" module-name="srcMissingTests" />
-    <orderEntry type="module" module-name="testsEmptySrc" />
-    <orderEntry type="module" module-name="testsMissingSrc" />
-    <orderEntry type="module" module-name="emptySrcEmptyTests" />
-    <orderEntry type="module" module-name="emptySrcMissingTests" />
-    <orderEntry type="module" module-name="missingSrcEmptyTests" />
-    <orderEntry type="module" module-name="missingSrcMissingTests" />
-    <orderEntry type="module" module-name="missingModule" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr
deleted file mode 100644
index 585c3fbb6084..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/emptySrc/emptySrc.iml" filepath="$PROJECT_DIR$/emptySrc/emptySrc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/missingSrc/missingSrc.iml" filepath="$PROJECT_DIR$/missingSrc/missingSrc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/emptyTests/emptyTests.iml" filepath="$PROJECT_DIR$/emptyTests/emptyTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/missingTests/missingTests.iml" filepath="$PROJECT_DIR$/missingTests/missingTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/srcEmptyTests/srcEmptyTests.iml" filepath="$PROJECT_DIR$/srcEmptyTests/srcEmptyTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/srcMissingTests/srcMissingTests.iml" filepath="$PROJECT_DIR$/srcMissingTests/srcMissingTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/testsEmptySrc/testsEmptySrc.iml" filepath="$PROJECT_DIR$/testsEmptySrc/testsEmptySrc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/testsMissingSrc/testsMissingSrc.iml" filepath="$PROJECT_DIR$/testsMissingSrc/testsMissingSrc.iml" />
-      <module fileurl="file://$PROJECT_DIR$/emptySrcEmptyTests/emptySrcEmptyTests.iml" filepath="$PROJECT_DIR$/emptySrcEmptyTests/emptySrcEmptyTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/emptySrcMissingTests/emptySrcMissingTests.iml" filepath="$PROJECT_DIR$/emptySrcMissingTests/emptySrcMissingTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/missingSrcEmptyTests/missingSrcEmptyTests.iml" filepath="$PROJECT_DIR$/missingSrcEmptyTests/missingSrcEmptyTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/missingSrcMissingTests/missingSrcMissingTests.iml" filepath="$PROJECT_DIR$/missingSrcMissingTests/missingSrcMissingTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/missingModule/missingModule.iml" filepath="$PROJECT_DIR$/missingModule/missingModule.iml" />
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml
deleted file mode 100644
index 9e63df535372..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml
deleted file mode 100644
index 966eb57b22c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt
deleted file mode 100644
index ff9c5e0b9409..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun main() {
-    srcEmptyTestsSrc()
-    srcMissingTestsSrc()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt
deleted file mode 100644
index cc763116f771..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun srcEmptyTestsSrc() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt
deleted file mode 100644
index c7d5b4972fce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun srcMissingTestsSrc() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt
deleted file mode 100644
index 61c73ddab941..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun test() {
-    testsEmptySrcTest()
-    testsMissingSrcTest()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt
deleted file mode 100644
index 39589622fc57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun testsEmptySrcTest() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt
deleted file mode 100644
index f2d092bab0c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun testsMissingSrcTest() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml
deleted file mode 100644
index 0ab15714c757..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt
deleted file mode 100644
index b0ae98fc0c7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/expected-output.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    META-INF-ex/
-      file2.js
-    dir/
-      file1.js
-    file0.js
-    jslib-example.js
-    jslib-example.meta.js
-    kotlin.js
-    kotlin.meta.js
-    res0.js
-    resdir/
-      res1.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt
deleted file mode 100644
index ee0be644f223..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import library.sample.pairAdd
-
-fun foo() {
-    val p = Pair(10, 20)
-    val x = pairAdd(p)
-    println("x=$x")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/expected-output.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/expected-output.txt
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr
deleted file mode 100644
index 12af7dde89af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="KotlinCompilerSettings">
-    <option name="copyJsLibraryFiles" value="false" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt
deleted file mode 100644
index f1204a3d82e9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import library.sample.pairAdd
-
-fun foo() {
-    val p = Pair1(10, 20)
-    val x = pairAdd(p)
-    println("x=$x")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt
deleted file mode 100644
index f1738e23acbf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/expected-output.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-kotlinProject/
-  custom/
-    META-INF-ex/
-      file2.js
-    dir/
-      file1.js
-    file0.js
-    jslib-example.js
-    jslib-example.meta.js
-    kotlin.js
-    kotlin.meta.js
-    res0.js
-    resdir/
-      res1.js
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr
deleted file mode 100644
index 8fed56d0828b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="KotlinCompilerSettings">
-    <option name="copyJsLibraryFiles" value="true" />
-    <option name="outputDirectoryForJsLibraryFiles" value="custom" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt
deleted file mode 100644
index ee0be644f223..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import library.sample.pairAdd
-
-fun foo() {
-    val p = Pair(10, 20)
-    val x = pairAdd(p)
-    println("x=$x")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/expected-output.txt
deleted file mode 100644
index cb855b4fc585..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/expected-output.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr
deleted file mode 100644
index 12af7dde89af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="KotlinCompilerSettings">
-    <option name="copyJsLibraryFiles" value="false" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt
deleted file mode 100644
index ee0be644f223..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import library.sample.pairAdd
-
-fun foo() {
-    val p = Pair(10, 20)
-    val x = pairAdd(p)
-    println("x=$x")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.ipr
deleted file mode 100644
index 16a88d840402..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/kotlinProject.ipr
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMap" value="true" />
-    <option name="sourceMapPrefix" value="prefix-dir/" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/src/pkg/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/src/pkg/test1.kt
deleted file mode 100644
index 112bd39189af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMap/src/pkg/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package pkg
-
-var log = ""
-
-fun foo(x: String) {
-    log += "$x;"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.ipr
deleted file mode 100644
index 8ad5a239b86c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="Kotlin2JsCompilerArguments">
-    <option name="sourceMap" value="true" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/src/pkg/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/src/pkg/test1.kt
deleted file mode 100644
index 112bd39189af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithSourceMapRelativePaths/src/pkg/test1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package pkg
-
-var log = ""
-
-fun foo(x: String) {
-    log += "$x;"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml
deleted file mode 100644
index 350676073d19..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr
deleted file mode 100644
index 0c363fe68d2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt
deleted file mode 100644
index bc18855ddf89..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-fun main() {
-}
-
-internal fun internalFun() {}
-
-internal val internalVal = 10
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt
deleted file mode 100644
index ad63f184bcee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun testMain() {
-    main()
-    internalFun()
-    var a = internalVal
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml
deleted file mode 100644
index 62e30d76009c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="srcOnly" />
-    <orderEntry type="module" module-name="testsOnly" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr
deleted file mode 100644
index 6c1fe3fe02d9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/srcOnly/srcOnly.iml" filepath="$PROJECT_DIR$/srcOnly/srcOnly.iml" />
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/testsOnly/testsOnly.iml" filepath="$PROJECT_DIR$/testsOnly/testsOnly.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt
deleted file mode 100644
index d922182462ec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main() {
-    srcOnly()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt
deleted file mode 100644
index 51563329121f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun srcOnly() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml
deleted file mode 100644
index c90834f2d607..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt
deleted file mode 100644
index 882f75a9953d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun testMain() {
-    main()
-    srcOnly()
-    testsOnly()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt
deleted file mode 100644
index b9c5f8d81aed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun testsOnly() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml
deleted file mode 100644
index d732721923ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml
deleted file mode 100644
index f3d9af241fb0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="srcAndTests" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr
deleted file mode 100644
index 6a444a0b5a87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/srcAndTests/srcAndTests.iml" filepath="$PROJECT_DIR$/srcAndTests/srcAndTests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt
deleted file mode 100644
index d4f0711d3f50..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import src.*
-import test.*
-
-fun main() {
-    srcAndTests()
-    ambiguous()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt
deleted file mode 100644
index 6bee19ef6ee6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package src
-
-fun srcAndTests() {}
-
-fun ambiguous() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt
deleted file mode 100644
index b7533d96c372..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-private fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml
deleted file mode 100644
index fc6e2c7a9cff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt
deleted file mode 100644
index 7b7f50ed9b58..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-import src.srcAndTests
-
-fun testSrcAndTests() {
-    srcAndTests()
-}
-
-fun ambiguous() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt
deleted file mode 100644
index a4442b1ed710..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-import src.*
-import test.*
-
-fun testMain() {
-    main()
-    srcAndTests()
-    testSrcAndTests()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt
deleted file mode 100644
index a48c24499888..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/expected-output.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-kotlinProject/
-  kotlinProject/
-    root-package.kjsm
-  kotlinProject.js
-  kotlinProject.meta.js
-  lib/
-    kotlin.js
-    kotlin.meta.js
-module2/
-  lib/
-    kotlin.js
-    kotlin.meta.js
-  module2/
-    module2/
-      module2.kjsm
-  module2.js
-  module2.meta.js
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml
deleted file mode 100644
index 11fe0ade95d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-    <orderEntry type="module" module-name="module2" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr
deleted file mode 100644
index b02ca501ac36..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml
deleted file mode 100644
index e9637fef0b30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt
deleted file mode 100644
index 3a30f60150a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package module2
-
-fun foo() {}
-
-public class Module2Class
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt
deleted file mode 100644
index 8f001cc1b991..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import module2.Module2Class
-
-fun foo() {
-    val tmp = Module2Class()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml
deleted file mode 100644
index 3776f58cd734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="srcs" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr
deleted file mode 100644
index 30c1d27da777..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/srcs/srcs.iml" filepath="$PROJECT_DIR$/srcs/srcs.iml" />
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt
deleted file mode 100644
index 4ec96fd4e151..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun main() {
-    src()
-    src2()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt
deleted file mode 100644
index 840b4c4a4856..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun src() {
-    src2()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt
deleted file mode 100644
index 2e9a4c8ea071..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun src2() {
-    src()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml
deleted file mode 100644
index cdfacea2bb68..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src2" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/src/test1.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProject/src/test1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt
deleted file mode 100644
index 6ec77d228879..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun bar() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr
deleted file mode 100644
index 7dc391eaceb2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/produciton_module/produciton_module.iml" filepath="$PROJECT_DIR$/produciton_module/produciton_module.iml" />
-      <module fileurl="file://$PROJECT_DIR$/test_module/test_module.iml" filepath="$PROJECT_DIR$/test_module/test_module.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml
deleted file mode 100644
index 786d75db373d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../out/production/produciton_module" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt
deleted file mode 100644
index f3b2ebc5254a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt
deleted file mode 100644
index 798f616299e1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-    foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml
deleted file mode 100644
index 62cd41c3ccb5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output-test url="file://$MODULE_DIR$/../out/test/test_module" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="produciton_module" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt
deleted file mode 100644
index 2c6966278bae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Output directory not specified for Module 'kotlinProject' production at line -1, column -1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml
deleted file mode 100644
index 43ffa57d1e2c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output-test url="file://$MODULE_DIR$/out/test/kotlinProject" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt
deleted file mode 100644
index 839220d10022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml
deleted file mode 100644
index 43ffa57d1e2c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output-test url="file://$MODULE_DIR$/out/test/kotlinProject" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt
deleted file mode 100644
index 839220d10022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml
deleted file mode 100644
index 3e989c372d44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/out/production/kotlinProject" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt
deleted file mode 100644
index a2c4e958bb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt
deleted file mode 100644
index 839220d10022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.iml
deleted file mode 100644
index 2d09c426ff08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/out/production/kotlinProject" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Bar.kt
deleted file mode 100644
index f577138fb1ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Bar.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class Bar() {
-    fun bar() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Foo.kt
deleted file mode 100644
index 494c3dea241d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/LanguageOrApiVersionChanged/src/Foo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Foo() {
-    fun foo() {
-        Bar().bar()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/Bar.kt
deleted file mode 100644
index 2c990ada4c74..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/Bar.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class Bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/boo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/boo.kt
deleted file mode 100644
index e9a050624da0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/boo.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package boo
-
-import foo.Bar
-
-fun boo(bar: Bar) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/main.kt
deleted file mode 100644
index cfcbc18690b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFiles/src/main.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-import boo.boo
-
-fun main(args: Array<String>) {
-    val bar = Bar()
-    boo(bar)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/Bar.kt
deleted file mode 100644
index ae9e0be18366..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/Bar.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class Bar
-
-fun other() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/boo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/boo.kt
deleted file mode 100644
index e9a050624da0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/boo.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package boo
-
-import foo.Bar
-
-fun boo(bar: Bar) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/main.kt
deleted file mode 100644
index cfcbc18690b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ManyFilesForPackage/src/main.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-import boo.boo
-
-fun main(args: Array<String>) {
-    val bar = Bar()
-    boo(bar)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.iml
deleted file mode 100644
index d04ecd6e02e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/src/Test.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/src/Test.java
deleted file mode 100644
index fc22b4f6f3b9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/PureJavaProject/src/Test.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    public static void main(String[] args) {
-       System.out.println("Hello");
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.iml
deleted file mode 100644
index d0e6f385eb52..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module3" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.ipr
deleted file mode 100644
index 79176c748e47..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/kotlinProject.ipr
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module3/module3.iml" filepath="$PROJECT_DIR$/module3/module3.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="libraryTable">
-    <library name="lib">
-      <ANNOTATIONS>
-        <root url="file://$PROJECT_DIR$/module2/lib" />
-      </ANNOTATIONS>
-      <CLASSES>
-        <root url="file://$PROJECT_DIR$/module2/lib" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="file://$PROJECT_DIR$/module2/lib" />
-      </SOURCES>
-    </library>
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.class b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.class
deleted file mode 100644
index 7acb6f1e5255..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.class
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.java
deleted file mode 100644
index bfa3c7fce0e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/J.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package j;
-
-import java.lang.String;
-
-public class J {
-    public String foo() {
-        return "";
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/annotations.xml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/annotations.xml
deleted file mode 100644
index fed8e0dba5ad..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/lib/j/annotations.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<root>
-    <item name='j.J java.lang.String foo()'>
-        <annotation name='org.jetbrains.annotations.NotNull'/>
-    </item>
-</root>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/module2.iml
deleted file mode 100644
index 053fd136108a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="KotlinRuntime" level="project" />
-    <orderEntry type="library" exported="" name="lib" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/JSecond.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/JSecond.java
deleted file mode 100644
index 3e46ffeedad5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/JSecond.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class JSecond {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/my.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/my.kt
deleted file mode 100644
index ad29e527067f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module2/src/my.kt
+++ /dev/null
@@ -1 +0,0 @@
-class K2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/module3.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/module3.iml
deleted file mode 100644
index ec820d230848..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/module3.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module2" exported="" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/src/m3.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/src/m3.kt
deleted file mode 100644
index 3310c2c0f0f3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/module3/src/m3.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-fun f() {
-  JSecond()
-  K2()
-  println("Hi")
-  takeNN(j.J().foo())
-}
-
-fun takeNN(a: Any) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/src/main.kt
deleted file mode 100644
index da493d01c7d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/ReexportedDependency/src/main.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-fun main() {
-  f()
-  JSecond()
-  K2()
-  println("Hi")
-  takeNN(j.J().foo())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.iml
deleted file mode 100644
index 0c4fb67a3d4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.ipr
deleted file mode 100644
index 8226e21ade35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/Foo.kt
deleted file mode 100644
index 0ac80e287784..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/Foo.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-open class Foo() {
-    companion object {
-        const val CONST = 0
-    }
-
-    inline fun bar() = 1
-}
-
-class FooChild() : Foo() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/main.kt
deleted file mode 100644
index 2e5d000513e6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/main.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-import utils.*
-
-fun main() {
-    Foo().bar()
-    Foo.CONST
-    util1()
-    util2()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part1.kt
deleted file mode 100644
index c83e13459bdd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("Utils")
-
-package utils
-
-fun util1() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part2.kt
deleted file mode 100644
index 0b1c8be02045..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/RelocatableCaches/src/utils/utils_part2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("Utils")
-
-package utils
-
-fun util2() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
deleted file mode 100644
index 307b7f1015cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/kotlinProject.ipr
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="CopyrightManager" default="">
-    <module2copyright />
-  </component>
-  <component name="DependencyValidationManager">
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </component>
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/module1/module1.iml" filepath="$PROJECT_DIR$/module1/module1.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module2/module2.iml" filepath="$PROJECT_DIR$/module2/module2.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/module1.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/module1.iml
deleted file mode 100644
index 0e80071dec9b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/module1.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="good.prefix" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java
deleted file mode 100644
index a62f5d9cb159..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package good.prefix;
-
-public class JavaDependency {
-    public void bar() {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java
deleted file mode 100644
index 3274d3549d78..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package good.prefix;
-
-public class JavaTest extends JavaDependency {
-    
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt
deleted file mode 100644
index 609e07b4c738..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package bad.prefix
-
-class KotlinTestInBadPrefix
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt
deleted file mode 100644
index 90c847137fa1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package good.prefix
-
-class KotlinTestInGoodPrefix
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt
deleted file mode 100644
index d27a3ac6bf58..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test.other
-
-import bad.prefix.KotlinTestInBadPrefix
-import good.prefix.KotlinTestInGoodPrefix
-import good.prefix.JavaTest;
-
-val goodTest = KotlinTestInGoodPrefix()
-val badTest = KotlinTestInBadPrefix()
-val javaTest = JavaTest().bar()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/module2.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/module2.iml
deleted file mode 100644
index 5517bfe3dd6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/module2.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="invalid-prefix.test"/>
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="module1" />
-    <orderEntry type="library" name="KotlinRuntime" level="project" />
-  </component>
-</module>
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/module2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/module2.kt
deleted file mode 100644
index 54cd6bd4c70b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/module2.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package some
-
-import bad.prefix.KotlinTestInBadPrefix
-import good.prefix.KotlinTestInGoodPrefix
-import good.prefix.JavaTest;
-
-val goodTest = KotlinTestInGoodPrefix()
-val badTest = KotlinTestInBadPrefix()
-val javaTest = JavaTest().bar()
-
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java
deleted file mode 100644
index cecb63b81317..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package test;
-
-import good.prefix.JavaTest;
-
-public class JavaRef {
-    public void foo(JavaTest javaTest) {
-        
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.iml
deleted file mode 100644
index cbc89b8246b3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="xxx"/>
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/OtherJava.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/OtherJava.java
deleted file mode 100644
index 0bb1d196b401..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/OtherJava.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package xxx;
-
-public class OtherJava {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/Test.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/Test.java
deleted file mode 100644
index 7588040949bf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/Test.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package xxx;
-
-public class Test {
-    String test(OtherJava otherJava) {
-        return "";
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/test.kt
deleted file mode 100644
index 1059b01fe47a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefix/src/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package xxx
-
-val test = Test().test(null)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.iml
deleted file mode 100644
index cbc89b8246b3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="xxx"/>
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/JavaWithInner.java b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/JavaWithInner.java
deleted file mode 100644
index d210fa6a2d7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/JavaWithInner.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package xxx;
-
-import xxx.JavaWithInner.TableRenderer.TableRow;
-
-public class JavaWithInner {
-    public static class TableRenderer{
-        public interface TableRow {
-        }
-    }
-
-    public static class TextRenderer implements TableRow {
-        public void method() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/test.kt
deleted file mode 100644
index eaca9b806966..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/SourcePackagePrefixWithInnerClasses/src/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package xxx
-
-val test = JavaWithInner.TextRenderer().method()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.iml
deleted file mode 100644
index a441b33e10b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.ipr
deleted file mode 100644
index 907477867713..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/kotlinProject.ipr
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/src/src.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/src/src.kt
deleted file mode 100644
index 2d1ad72754c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/src/src.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun foo() { }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/test/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/test/test.kt
deleted file mode 100644
index e3cac1c58f9c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/TestDependencyLibrary/test/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun test() {
-  println("a")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.iml b/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.iml
deleted file mode 100644
index a0cbe5482427..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="kotlinProject" />
-  </component>
-</module>
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.ipr b/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.ipr
deleted file mode 100644
index a9c7f866ea17..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/kotlinProject.ipr
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-  </component>
-  <component name="KotlinCompilerSettings">
-    <option name="additionalArguments" value="-abcdefghij-invalid-argument" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/src/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/src/test.kt
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/general/WrongArgument/src/test.kt
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/README.md b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/README.md
deleted file mode 100644
index 334e95185f12..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-The same tests are run by both `AbstractIncrementalCacheVersionChangedTest` and `AbstractDataContainerVersionChangedTest`.
-
-## AbstractIncrementalCacheVersionChangedTest
-
-Tests for changing targets **local** cache version for each modification step.
-
-Individual tests can:
-- can skip changing the version at any step by adding files like `module1_do-not-change-cache-versions.new.2`
-- clear has-kotlin flag by adding files like `module1_clear-has-kotlin.new.1`
-
-## AbstractDataContainerVersionChangedTest
-
-Tests for changing version of **global** lookups cache for each modification step.
-Note that `build.log` file for this test case is named as `data-container-version-build.log`.
-
-Individual tests can can skip changing the version at any step by adding files like `module1_do-not-change-cache-versions.new.2`.
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log
deleted file mode 100644
index 5d72b80b48ab..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/C.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  module1/src/C.java
-End of files
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/A.class
-  out/production/module1/META-INF/module1.kotlin_module
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module1/B.class
-  out/production/module1/META-INF/module1.kotlin_module
-End of files
-Compiling files:
-  module1/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt
deleted file mode 100644
index 07917d6cffbf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt
deleted file mode 100644
index fb7337ede5b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt
deleted file mode 100644
index 3e191f19471a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt
+++ /dev/null
@@ -1 +0,0 @@
-class B
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java
deleted file mode 100644
index f9822136b3de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java
+++ /dev/null
@@ -1 +0,0 @@
-class C {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java
deleted file mode 100644
index 470ad77df606..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java
+++ /dev/null
@@ -1 +0,0 @@
-class D {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt
deleted file mode 100644
index 83c981d6f4d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt
+++ /dev/null
@@ -1 +0,0 @@
-class E
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt
deleted file mode 100644
index a6dfc0f60b11..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt
+++ /dev/null
@@ -1 +0,0 @@
-class F
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/build.log
deleted file mode 100644
index d02fa1eecfd4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/build.log
+++ /dev/null
@@ -1,54 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
-Marked as dirty by Kotlin:
-  module3/src/C.kt
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/C.class
-End of files
-Compiling files:
-  module3/src/C.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module4
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
-Marked as dirty by Kotlin:
-  module4/src/D.kt
-Cleaning output files:
-  out/production/module4/D/D.class
-  out/production/module4/META-INF/module4.kotlin_module
-End of files
-Compiling files:
-  module4/src/D.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
deleted file mode 100644
index 7090b81e302e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log
+++ /dev/null
@@ -1,48 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-  module2/src/B.kt
-  module3/src/C.kt
-  module4/src/D.kt
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/C.class
-End of files
-Compiling files:
-  module3/src/C.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/D/D.class
-  out/production/module4/META-INF/module4.kotlin_module
-End of files
-Compiling files:
-  module4/src/D.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt
deleted file mode 100644
index f5f92433d7f2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module1->
-module2->module1[exported]
-module3->module2
-module4->module3
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt
deleted file mode 100644
index 21df9b5ad055..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt
deleted file mode 100644
index 48d8f912431d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package b
-
-import a.A
-
-open class B {
-    val a = A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt
deleted file mode 100644
index 3ed85781d908..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package c
-
-import b.B
-
-open class C {
-    val b = B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt
deleted file mode 100644
index 828f5775eb5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package D
-
-import c.C
-
-open class D {
-    val c = C()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log
deleted file mode 100644
index 2bada43544aa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log
+++ /dev/null
@@ -1,35 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/A.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  module1/src/A.java
-End of files
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/B.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  module1/src/B.java
-End of files
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt
deleted file mode 100644
index 0341c1ffd5c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module2
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java
deleted file mode 100644
index 37bdd2221a71..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java
+++ /dev/null
@@ -1 +0,0 @@
-class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java
deleted file mode 100644
index e747fd3a8061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java
+++ /dev/null
@@ -1 +0,0 @@
-class B {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java
deleted file mode 100644
index f9822136b3de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java
+++ /dev/null
@@ -1 +0,0 @@
-class C {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/build.log
deleted file mode 100644
index cb094cc1d725..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/build.log
+++ /dev/null
@@ -1,58 +0,0 @@
-================ Step #1 =================
-
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
-Marked as dirty by Kotlin:
-  module4/src/d.kt
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/module4/D.class
-End of files
-Compiling files:
-  module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
-Marked as dirty by Kotlin:
-  module3/src/c.kt
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
deleted file mode 100644
index ed687a743baf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
+++ /dev/null
@@ -1,52 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-  module2/src/b.kt
-  module3/src/c.kt
-  module4/src/d.kt
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/module4/D.class
-End of files
-Compiling files:
-  module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt
deleted file mode 100644
index b7b899af80f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module1->
-module2->module1
-module3->module2
-module4->
-module5->
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java
deleted file mode 100644
index 37bdd2221a71..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java
+++ /dev/null
@@ -1 +0,0 @@
-class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt
deleted file mode 100644
index ae1b119fb6da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java
deleted file mode 100644
index e747fd3a8061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java
+++ /dev/null
@@ -1 +0,0 @@
-class B {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt
deleted file mode 100644
index 413a8224329e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package module2
-
-import module1.*
-
-fun b() {
-    A()
-    a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java
deleted file mode 100644
index f9822136b3de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java
+++ /dev/null
@@ -1 +0,0 @@
-class C {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt
deleted file mode 100644
index 3dfe95ad6944..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package module3
-
-import module2.*
-
-fun c() {
-    b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java
deleted file mode 100644
index 470ad77df606..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java
+++ /dev/null
@@ -1 +0,0 @@
-class D {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt
deleted file mode 100644
index b0747db7a0ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module4
-
-class D
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java
deleted file mode 100644
index 3f5b139b15ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package module5;
-
-class E {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/build.log
deleted file mode 100644
index ab0f369b43e5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/build.log
+++ /dev/null
@@ -1,29 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
deleted file mode 100644
index 06ec947840b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log
+++ /dev/null
@@ -1,27 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-  module2/src/b.kt
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt
deleted file mode 100644
index ae1b119fb6da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt
deleted file mode 100644
index b7e97d330f48..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package module2
-
-import module1.*
-
-fun b(param: A) {
-    a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
deleted file mode 100644
index 91b933118424..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
deleted file mode 100644
index 4cc059a3da60..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-  module2/src/B.kt
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt
deleted file mode 100644
index 04406896cf1e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-val X = 10
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new
deleted file mode 100644
index 7702c5904f0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-val X = 11
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt
deleted file mode 100644
index fac015d2d495..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package b
-
-class B {
-    val x = a.X
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java
deleted file mode 100644
index 6eb41bfcd2d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package b;
-
-class C {
-    C() {
-        new B();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
deleted file mode 100644
index 782a86c4cf3d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log
+++ /dev/null
@@ -1,29 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
deleted file mode 100644
index 7f894f1135f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log
+++ /dev/null
@@ -1,27 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/A.kt
-  module2/src/B.kt
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt
deleted file mode 100644
index 557b1805d4c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-open class A
-
-inline fun f(): A {
-    return A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt
deleted file mode 100644
index 3edc9740e234..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package b
-
-import a.*
-
-open class B {
-    val a = f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java
deleted file mode 100644
index 6eb41bfcd2d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package b;
-
-class C {
-    C() {
-        new B();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/a.kt
deleted file mode 100644
index 9a91e164a2dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f() {
-    other.other()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt
deleted file mode 100644
index f4131c37ad16..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun g() {
-    other.other()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/build.log
deleted file mode 100644
index e20f9576dc2b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/other/OtherKt.class
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
deleted file mode 100644
index 74e2febc1a5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/other/OtherKt.class
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/other.kt
deleted file mode 100644
index 3b98ad64c050..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedFile/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package other
-
-fun other() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java
deleted file mode 100644
index 37bdd2221a71..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java
+++ /dev/null
@@ -1 +0,0 @@
-class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt
deleted file mode 100644
index 9a91e164a2dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f() {
-    other.other()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt
deleted file mode 100644
index f4131c37ad16..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun g() {
-    other.other()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
deleted file mode 100644
index 5c832839323d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/other/OtherKt.class
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
deleted file mode 100644
index 53226e32cef6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/other/OtherKt.class
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt
deleted file mode 100644
index 3b98ad64c050..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package other
-
-fun other() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt
deleted file mode 100644
index 91fe7016ac5e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt
deleted file mode 100644
index c8d3d7712513..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun g() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
deleted file mode 100644
index f8e994650ec7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/build.log
+++ /dev/null
@@ -1,17 +0,0 @@
-================ Step #1 =================
-
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module' production) are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
deleted file mode 100644
index 62e214f26295..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log
+++ /dev/null
@@ -1,17 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
deleted file mode 100644
index bfbf2fe45508..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-module1
-module2
-module3
-module4
-module5
-
-module2 -> module1
-module3 -> module2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_steps.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_steps.txt
deleted file mode 100644
index fa06290ed384..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/_steps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add file with compilation error to module1
-fix compilation error in module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/build.log
deleted file mode 100644
index 867b055aefc5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/build.log
+++ /dev/null
@@ -1,79 +0,0 @@
-================ Step #1 add file with compilation error to module1 =================
-
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module4' production) are INVALID
-Marked as dirty by Kotlin:
-  module4/src/d.kt
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/module4/D.class
-End of files
-Compiling files:
-  module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module1
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module1' production) are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-  module1/src/f.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-  out/production/module1/module1/FKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-  module1/src/f.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Name expected
-
-================ Step #2 fix compilation error in module1 =================
-
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module1
-Compiling files:
-  module1/src/a.kt
-  module1/src/f.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module2' production) are INVALID
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Local cache for KotlinChunk<KotlinJvmModuleBuildTarget>(Module 'module3' production) are INVALID
-Marked as dirty by Kotlin:
-  module3/src/c.kt
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
deleted file mode 100644
index 1ca540d894e1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
+++ /dev/null
@@ -1,73 +0,0 @@
-================ Step #1 add file with compilation error to module1 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-  module1/src/f.kt
-  module2/src/b.kt
-  module3/src/c.kt
-  module4/src/d.kt
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/module4/D.class
-End of files
-Compiling files:
-  module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/A.class
-  out/production/module1/module1/AKt.class
-  out/production/module1/module1/FKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-  module1/src/f.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Name expected
-
-================ Step #2 fix compilation error in module1 =================
-
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module1
-Compiling files:
-  module1/src/a.kt
-  module1/src/f.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/module3/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt
deleted file mode 100644
index ae1b119fb6da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1
deleted file mode 100644
index 773fd8147a8a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package module1
-
-class
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2
deleted file mode 100644
index 253e9fcc4f54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2
+++ /dev/null
@@ -1,6 +0,0 @@
-package module1
-
-class A
-
-fun a() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_f.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_f.kt
deleted file mode 100644
index 03ab3d24beb2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module1_f.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module1
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module2_b.kt
deleted file mode 100644
index 413a8224329e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module2_b.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package module2
-
-import module1.*
-
-fun b() {
-    A()
-    a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module3_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module3_c.kt
deleted file mode 100644
index 3dfe95ad6944..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module3_c.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package module3
-
-import module2.*
-
-fun c() {
-    b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module4_d.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module4_d.kt
deleted file mode 100644
index b0747db7a0ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module4_d.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module4
-
-class D
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module5_E.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module5_E.java
deleted file mode 100644
index 3f5b139b15ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/cacheVersionChanged/withError/module5_E.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package module5;
-
-class E {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt
deleted file mode 100644
index 698d200e1292..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module1->
-module2->module1
-module3->module2
-module4->module3
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt
deleted file mode 100644
index 24b8103df026..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/_steps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-change module2 and disable incremental compilation
-change module2 again
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/build.log
deleted file mode 100644
index 82008d489a81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/build.log
+++ /dev/null
@@ -1,64 +0,0 @@
-================ Step #1 change module2 and disable incremental compilation =================
-
-Lookups cache are SHOULD_BE_CLEARED
-Local cache for Module 'module1' production are SHOULD_BE_CLEARED
-Local cache for Module 'module2' production are SHOULD_BE_CLEARED
-Local cache for Module 'module3' production are SHOULD_BE_CLEARED
-Local cache for Module 'module4' production are SHOULD_BE_CLEARED
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AKt.class
-End of files
-Exit code: CHUNK_REBUILD_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/foo/BKt.class
-  out/production/module2/foo/CKt.class
-End of files
-Compiling files:
-  module2/src/a.kt
-  module2/src/b.kt
-  module2/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 change module2 again =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AKt.class
-End of files
-Exit code: CHUNK_REBUILD_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/foo/BKt.class
-  out/production/module2/foo/CKt.class
-End of files
-Compiling files:
-  module2/src/a.kt
-  module2/src/b.kt
-  module2/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt
deleted file mode 100644
index 6c3efb0caef6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-kotlin-data-container
-Module 'module1' production
-    jvm-build-meta-info.txt
-Module 'module1' tests
-Module 'module2' production
-    jvm-build-meta-info.txt
-Module 'module2' tests
-Module 'module3' production
-    jvm-build-meta-info.txt
-Module 'module3' tests
-Module 'module4' production
-    jvm-build-meta-info.txt
-Module 'module4' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt
deleted file mode 100644
index 37f1b9cdacde..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class Z
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt
deleted file mode 100644
index d1073bce1241..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1
deleted file mode 100644
index 82516f3196c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2
deleted file mode 100644
index 23b51e42e784..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt
deleted file mode 100644
index 1063d0366363..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun b(): Int = a()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt
deleted file mode 100644
index ac7ece7d3d7e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun c(): Int = b()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1
deleted file mode 100644
index b5a9a3b3b515..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1
+++ /dev/null
@@ -1 +0,0 @@
-off
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt
deleted file mode 100644
index 92d8afd3c2ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class D
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt
deleted file mode 100644
index 4fcb25846089..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class E
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
deleted file mode 100644
index f02b9c5bd632..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log
+++ /dev/null
@@ -1,122 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are SHOULD_BE_CLEARED
-Local cache for Module 'module1' production are SHOULD_BE_CLEARED
-Local cache for Module 'module2' production are SHOULD_BE_CLEARED
-Local cache for Module 'module3' production are SHOULD_BE_CLEARED
-Local cache for Module 'module4' production are SHOULD_BE_CLEARED
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AKt.class
-End of files
-Exit code: CHUNK_REBUILD_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/foo/BKt.class
-  out/production/module2/foo/CKt.class
-End of files
-Compiling files:
-  module2/src/a.kt
-  module2/src/b.kt
-  module2/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/z.kt
-  module2/src/a.kt
-  module2/src/b.kt
-  module2/src/c.kt
-  module3/src/d.kt
-  module4/src/e.kt
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/Z.class
-End of files
-Compiling files:
-  module1/src/z.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AKt.class
-  out/production/module2/foo/BKt.class
-  out/production/module2/foo/CKt.class
-End of files
-Compiling files:
-  module2/src/a.kt
-  module2/src/b.kt
-  module2/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/foo/D.class
-End of files
-Compiling files:
-  module3/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/foo/E.class
-End of files
-Compiling files:
-  module4/src/e.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AKt.class
-End of files
-Compiling files:
-  module2/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt
deleted file mode 100644
index 698d200e1292..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module1->
-module2->module1
-module3->module2
-module4->module3
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
deleted file mode 100644
index d44fbba4050c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module1' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    class-attributes.tab
-    class-fq-name-to-source.tab
-    internal-name-to-source.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module1' tests
-Module 'module2' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    inline-functions.tab
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module2' tests
-Module 'module3' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    class-attributes.tab
-    class-fq-name-to-source.tab
-    internal-name-to-source.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module3' tests
-Module 'module4' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    class-attributes.tab
-    class-fq-name-to-source.tab
-    internal-name-to-source.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module4' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt
deleted file mode 100644
index 37f1b9cdacde..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class Z
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt
deleted file mode 100644
index d1073bce1241..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1
deleted file mode 100644
index 82516f3196c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2
deleted file mode 100644
index 23b51e42e784..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3
deleted file mode 100644
index 2466d7325d06..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun a(): Int = 3
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt
deleted file mode 100644
index 1063d0366363..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun b(): Int = a()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt
deleted file mode 100644
index ac7ece7d3d7e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun c(): Int = b()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1
deleted file mode 100644
index b5a9a3b3b515..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1
+++ /dev/null
@@ -1 +0,0 @@
-off
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2
deleted file mode 100644
index e8fd903040e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2
+++ /dev/null
@@ -1 +0,0 @@
-on
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt
deleted file mode 100644
index 92d8afd3c2ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class D
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt
deleted file mode 100644
index 4fcb25846089..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class E
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
deleted file mode 100644
index 046b885b8b72..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/build.log
+++ /dev/null
@@ -1,57 +0,0 @@
-================ Step #1 =================
-
-Lookups cache are SHOULD_BE_CLEARED
-Local cache for Module 'module1' production are SHOULD_BE_CLEARED
-Local cache for Module 'module2' production are SHOULD_BE_CLEARED
-Local cache for Module 'module3' production are SHOULD_BE_CLEARED
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 =================
-
-Lookups cache are INVALID
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-  module2/src/c.kt
-  module3/src/d.kt
-Building module1
-Cleaning output files:
-  out/production/module1/AKt.class
-  out/production/module1/META-INF/module1.kotlin_module
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/B.class
-  out/production/module2/CKt.class
-  out/production/module2/META-INF/module2.kotlin_module
-End of files
-Compiling files:
-  module2/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  module2/src/B.java
-End of files
-Building module3
-Cleaning output files:
-  out/production/module3/DKt.class
-  out/production/module3/META-INF/module3.kotlin_module
-End of files
-Compiling files:
-  module3/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
deleted file mode 100644
index 0341c1ffd5c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module2
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
deleted file mode 100644
index bc3f147180b8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module1' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module1' tests
-Module 'module2' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module2' tests
-Module 'module3' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module3' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
deleted file mode 100644
index 71db38595a05..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module1_a.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun a() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
deleted file mode 100644
index e747fd3a8061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java
+++ /dev/null
@@ -1 +0,0 @@
-class B {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
deleted file mode 100644
index e747fd3a8061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_B.java.new.2
+++ /dev/null
@@ -1 +0,0 @@
-class B {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
deleted file mode 100644
index ae6b28747faa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_c.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun c() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
deleted file mode 100644
index b5a9a3b3b515..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.1
+++ /dev/null
@@ -1 +0,0 @@
-off
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
deleted file mode 100644
index e8fd903040e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module2_incremental-compilation.new.2
+++ /dev/null
@@ -1 +0,0 @@
-on
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
deleted file mode 100644
index eda79f72f219..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged/module3_d.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun d() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
deleted file mode 100644
index 37bdd2221a71..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/A.java
+++ /dev/null
@@ -1 +0,0 @@
-class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
deleted file mode 100644
index e747fd3a8061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/B.java
+++ /dev/null
@@ -1 +0,0 @@
-class B {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
deleted file mode 100644
index 8438edea804e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/build.log
+++ /dev/null
@@ -1,9 +0,0 @@
-================ Step #1 =================
-
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 =================
-
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
deleted file mode 100644
index 6feaf1a52c0b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-kotlin-data-container
-Module 'module' production
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
deleted file mode 100644
index b5a9a3b3b515..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.1
+++ /dev/null
@@ -1 +0,0 @@
-off
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
deleted file mode 100644
index e8fd903040e4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly/incremental-compilation.new.2
+++ /dev/null
@@ -1 +0,0 @@
-on
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt
deleted file mode 100644
index 700be2ad7e4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt
+++ /dev/null
@@ -1 +0,0 @@
-annotation class Ann1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1
deleted file mode 100644
index d01ba85a9bf4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-class Ann1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2
deleted file mode 100644
index 700be2ad7e4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-annotation class Ann1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt
deleted file mode 100644
index 42dfdb1c4fac..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt
+++ /dev/null
@@ -1 +0,0 @@
-annotation class Ann2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt
deleted file mode 100644
index ad3f6f5ef008..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann1
-class UseAnn1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt
deleted file mode 100644
index 2536f9af76ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann2
-class UseAnn2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log
deleted file mode 100644
index b70458dbf754..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log
+++ /dev/null
@@ -1,46 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Ann1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Ann1.kt
-End of files
-Marked as dirty by Kotlin:
-  src/UseAnn1Class.kt
-  src/useAnn1Fun.kt
-  src/useAnn1Val.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAnn1.class
-  out/production/module/UseAnn1FunKt.class
-  out/production/module/UseAnn1ValKt.class
-End of files
-Compiling files:
-  src/UseAnn1Class.kt
-  src/useAnn1Fun.kt
-  src/useAnn1Val.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'Ann1' is not an annotation class
-'Ann1' is not an annotation class
-'Ann1' is not an annotation class
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Ann1.class
-End of files
-Compiling files:
-  src/Ann1.kt
-  src/UseAnn1Class.kt
-  src/useAnn1Fun.kt
-  src/useAnn1Val.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt
deleted file mode 100644
index 901f70ec8fa3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann1
-fun useAnn1() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt
deleted file mode 100644
index dcc6a8d732da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann1
-val useAnn1Val = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt
deleted file mode 100644
index 733627858aad..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann2
-fun useAnn2() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt
deleted file mode 100644
index 8e10342e1aa3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Ann2
-val useAnn2Val = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1
deleted file mode 100644
index 9c7d9dc40fa3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-annotation class Ann
-
-@Ann
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2
deleted file mode 100644
index b349e8e377a9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-annotation class Ann
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/build.log
deleted file mode 100644
index ab20a6a587db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/build.log
+++ /dev/null
@@ -1,108 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-  out/production/module/foo/Ann.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt
deleted file mode 100644
index 02bb019e8a21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A<T> {
-    open fun f(x: T) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt
deleted file mode 100644
index a466bbf9c190..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A<Int>()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new
deleted file mode 100644
index 04773fe5c7aa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class AChild : A<Int>() {
-    override fun f(x: Int) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log
deleted file mode 100644
index 8bed89d20978..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-End of files
-Compiling files:
-  src/AChild.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt
deleted file mode 100644
index 32b132335bf6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f(0)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1
deleted file mode 100644
index 49a0e61be120..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/build.log
deleted file mode 100644
index 885ef88c2997..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/build.log
+++ /dev/null
@@ -1,78 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-This type is final, so it cannot be inherited from
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1
deleted file mode 100644
index 67301a99f6b7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-interface A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/build.log
deleted file mode 100644
index 302867e79fa2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/build.log
+++ /dev/null
@@ -1,83 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-This class does not have a constructor
-Interface A does not have constructors
-Interface A does not have constructors
-Interface A does not have constructors
-Interface A does not have constructors
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A$DefaultImpls.class
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1
deleted file mode 100644
index dace6cffce46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-private open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
deleted file mode 100644
index 0ce14b0effbc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log
+++ /dev/null
@@ -1,94 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-'public' generic exposes its 'private-in-file' parameter bound type A
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-'public' function exposes its 'private-in-file' parameter type A
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-'public' function exposes its 'private-in-file' return type A
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-'public' function exposes its 'private-in-file' return type A
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-'public' function exposes its 'private-in-file' return type A
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
deleted file mode 100644
index 01404f56ca23..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-open class A {
-}
-
-open class X {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
deleted file mode 100644
index 518259f0d60d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/A.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-open class A {
-    open class X {
-        open fun g() {}
-    }
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
deleted file mode 100644
index 8f68b9914291..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B : A() {
-    open inner class Y : X()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
deleted file mode 100644
index bea253538037..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-open class C : B() {
-    open inner class Z : Y() {
-        override fun f() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
deleted file mode 100644
index c61b0e0fa883..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/C.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-open class C : B() {
-    open inner class Z : Y() {
-        override fun g() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
deleted file mode 100644
index fce0dad5936c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/B.kt
-  src/C.kt
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/B$Y.class
-  out/production/module/B.class
-  out/production/module/C$Z.class
-  out/production/module/C.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/X.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/C.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt
deleted file mode 100644
index 19a6b32f38d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt
deleted file mode 100644
index f0800c360d37..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class B : A() {
-    fun bar() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2
deleted file mode 100644
index 00327a6911ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class B {
-    fun bar() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/C.kt
deleted file mode 100644
index a539cafa7f27..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/C.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class C : B() {
-    fun baz() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/build.log
deleted file mode 100644
index 924010ea22bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/build.log
+++ /dev/null
@@ -1,56 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/C.kt
-  src/createA.kt
-  src/createB.kt
-  src/createC.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-  src/useCbaz.kt
-Cleaning output files:
-  out/production/module/foo/B.class
-  out/production/module/foo/C.class
-  out/production/module/use/CreateAKt.class
-  out/production/module/use/CreateBKt.class
-  out/production/module/use/CreateCKt.class
-  out/production/module/use/UseAfooKt.class
-  out/production/module/use/UseBbarKt.class
-  out/production/module/use/UseCbazKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/createA.kt
-  src/createB.kt
-  src/createC.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-  src/useCbaz.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: A
-Unresolved reference: A
-
-================ Step #2 =================
-
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/createA.kt
-  src/createB.kt
-  src/createC.kt
-  src/funA.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-  src/useCbaz.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createA.kt
deleted file mode 100644
index 6821a4e06c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createA() = A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createB.kt
deleted file mode 100644
index 743cd73cb579..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createB() = B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createC.kt
deleted file mode 100644
index 403887a65ee4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/createC.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createC() = C()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2
deleted file mode 100644
index b878a6b5466a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-fun A(a: Int = 1) = AnotherA()
-
-class AnotherA {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt
deleted file mode 100644
index ebac21a6cbeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt
deleted file mode 100644
index cad51bcbad14..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useBbar() {
-    createB().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt
deleted file mode 100644
index 72c907f222c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useCbaz() {
-    createC().baz()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt
deleted file mode 100644
index 19a6b32f38d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2
deleted file mode 100644
index 19a6b32f38d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt
deleted file mode 100644
index dede900d0bd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class B : A() {
-    fun bar() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
deleted file mode 100644
index 0b22828467c5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log
+++ /dev/null
@@ -1,54 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/createA.kt
-  src/createB.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-Cleaning output files:
-  out/production/module/foo/B.class
-  out/production/module/use/CreateAKt.class
-  out/production/module/use/CreateBKt.class
-  out/production/module/use/UseAfooKt.class
-  out/production/module/use/UseBbarKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/createA.kt
-  src/createB.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: A
-Unresolved reference: A
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/createA.kt
-  src/createB.kt
-  src/useAfoo.kt
-  src/useBbar.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 =================
-
-Compiling files:
-  src/failCompilation.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting a top level declaration
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt
deleted file mode 100644
index 6821a4e06c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createA() = A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt
deleted file mode 100644
index 743cd73cb579..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createB() = B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3
deleted file mode 100644
index fed605d81da2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO remove this file after IDEA-154389 will be fixed
-
-invalid_code
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt
deleted file mode 100644
index ebac21a6cbeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt
deleted file mode 100644
index cad51bcbad14..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useBbar() {
-    createB().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt
deleted file mode 100644
index 953bf9cccce1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-    companion object AA : B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt
deleted file mode 100644
index 907bdf343876..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    val x: String = ""
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1
deleted file mode 100644
index d31e5521fd08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    val x: String? = null
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
deleted file mode 100644
index 880e2168bd2f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log
+++ /dev/null
@@ -1,56 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/A$AA.class
-  out/production/module/A.class
-  out/production/module/CompanionExtensionKt.class
-  out/production/module/CompanionReferenceExplicitKt.class
-  out/production/module/CompanionReferenceImplicitKt.class
-  out/production/module/ImportedMemberKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt
deleted file mode 100644
index 0439b62dc81e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2
deleted file mode 100644
index 027cee43fc0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt
deleted file mode 100644
index e4de1c3179ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2
deleted file mode 100644
index 35c8a751b5ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt
deleted file mode 100644
index b754b007c152..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2
deleted file mode 100644
index 50238db801d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt
deleted file mode 100644
index 0855d82a7ec5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import A.AA.x
-
-fun importedMember() {
-    x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2
deleted file mode 100644
index d84104b6a4f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-import A.AA.x
-
-fun importedMember() {
-    x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt
deleted file mode 100644
index 9023a3c731d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    companion object AA {
-        val x: String = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1
deleted file mode 100644
index 0976411519fe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    companion object AA {
-        val x: String? = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
deleted file mode 100644
index db1bb1a9feb6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log
+++ /dev/null
@@ -1,53 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A$AA.class
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/CompanionExtensionKt.class
-  out/production/module/CompanionReferenceExplicitKt.class
-  out/production/module/CompanionReferenceImplicitKt.class
-  out/production/module/ImportedMemberKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A$AA.class
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-  src/importedMember.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt
deleted file mode 100644
index 0439b62dc81e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2
deleted file mode 100644
index 027cee43fc0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt
deleted file mode 100644
index e4de1c3179ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2
deleted file mode 100644
index 35c8a751b5ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt
deleted file mode 100644
index b754b007c152..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2
deleted file mode 100644
index 50238db801d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt
deleted file mode 100644
index 0855d82a7ec5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import A.AA.x
-
-fun importedMember() {
-    x.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2
deleted file mode 100644
index d84104b6a4f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-import A.AA.x
-
-fun importedMember() {
-    x?.length
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt
deleted file mode 100644
index bfaf514dd9a3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    companion object {
-        val x: String = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1
deleted file mode 100644
index 9023a3c731d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    companion object AA {
-        val x: String = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
deleted file mode 100644
index 6ac7ec079b29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log
+++ /dev/null
@@ -1,44 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-Cleaning output files:
-  out/production/module/A$Companion.class
-  out/production/module/A.class
-  out/production/module/CompanionExtensionKt.class
-  out/production/module/CompanionReferenceExplicitKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: Companion
-Unresolved reference: Companion
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-End of files
-Marked as dirty by Kotlin:
-  src/companionReferenceImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/CompanionReferenceImplicitKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/companionReferenceImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt
deleted file mode 100644
index 5968cacacaac..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.Companion.ext() {
-    x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2
deleted file mode 100644
index 983f6be3eec0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt
deleted file mode 100644
index e5a86cc31a22..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.Companion.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2
deleted file mode 100644
index 1a0c196d40c9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt
deleted file mode 100644
index b811959ef21b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt
deleted file mode 100644
index 9023a3c731d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    companion object AA {
-        val x: String = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1
deleted file mode 100644
index bbcc3b8bd24f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    object AA {
-        val x: String = ""
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
deleted file mode 100644
index 7f1637ab23ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log
+++ /dev/null
@@ -1,46 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A$AA.class
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/CompanionExtensionKt.class
-  out/production/module/CompanionReferenceExplicitKt.class
-  out/production/module/CompanionReferenceImplicitKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: x
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A$AA.class
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/companionExtension.kt
-  src/companionReferenceExplicit.kt
-  src/companionReferenceImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt
deleted file mode 100644
index 983f6be3eec0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun A.AA.ext() {
-    x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt
deleted file mode 100644
index 1a0c196d40c9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun explicitRef() {
-    A.AA.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt
deleted file mode 100644
index b811959ef21b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2
deleted file mode 100644
index af0f9bee8f3d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun implicitRef() {
-    A.AA.x.hashCode()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1
deleted file mode 100644
index bc98fc870516..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A private constructor ()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
deleted file mode 100644
index a58d7729c360..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log
+++ /dev/null
@@ -1,41 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/createA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/CreateAKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/createA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access '<init>': it is private in 'A'
-Cannot access '<init>': it is private in 'A'
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/createA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt
deleted file mode 100644
index bb948def8b9f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createA() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt
deleted file mode 100644
index 8166e17bf2e6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createAChild() {
-    AChild()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt
deleted file mode 100644
index 8e80c9708b0d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-enum class Enum {
-    A,
-    B
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1
deleted file mode 100644
index d8b67e717460..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-enum class Enum {
-    A,
-    B,
-    C
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log
deleted file mode 100644
index 9b457f35f2bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Enum.kt
-End of files
-Marked as dirty by Kotlin:
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/GetRandomEnumEntryKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseEnumImplicitlyKt.class
-  out/production/module/UseKt$WhenMappings.class
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-End of files
-Compiling files:
-  src/Enum.kt
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt
deleted file mode 100644
index 8c0a987e8dc1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun getRandomEnumEntry() =
-        Enum.values()[1]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt
deleted file mode 100644
index 14d2aa5be07b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2
deleted file mode 100644
index d64d3769328f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-            C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt
deleted file mode 100644
index d5ad0b4c83a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useImplicit() {
-    println(use(getRandomEnumEntry()))
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
deleted file mode 100644
index d8b67e717460..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-enum class Enum {
-    A,
-    B,
-    C
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
deleted file mode 100644
index 8e80c9708b0d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-enum class Enum {
-    A,
-    B
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log
deleted file mode 100644
index 9997e126b953..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build-with-scope-expansion.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Enum.kt
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: C
-
-================ Step #2 =================
-
-Compiling files:
-  src/Enum.kt
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
deleted file mode 100644
index 625f7161de5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Enum.kt
-End of files
-Marked as dirty by Kotlin:
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/GetRandomEnumEntryKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseEnumImplicitlyKt.class
-  out/production/module/UseKt$WhenMappings.class
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: C
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-End of files
-Compiling files:
-  src/Enum.kt
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
deleted file mode 100644
index 8c0a987e8dc1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun getRandomEnumEntry() =
-        Enum.values()[1]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
deleted file mode 100644
index 7c634aa2226e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/js-build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Enum.kt
-  src/use.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: C
-
-================ Step #2 =================
-
-Compiling files:
-  src/Enum.kt
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
deleted file mode 100644
index d64d3769328f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-            C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
deleted file mode 100644
index 14d2aa5be07b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
deleted file mode 100644
index d5ad0b4c83a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useImplicit() {
-    println(use(getRandomEnumEntry()))
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt
deleted file mode 100644
index c31e0adb4000..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-enum class Enum(x: String) {
-    A("a"),
-    B("b");
-
-    val becameNullable: Any = x
-    val unchanged: Any = x
-}
-
-fun Any.string() = this as String
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1
deleted file mode 100644
index 50291584b5b3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1
+++ /dev/null
@@ -1,9 +0,0 @@
-enum class Enum(x: String) {
-    A("a"),
-    B("b");
-
-    val becameNullable: Any? = x
-    val unchanged: Any = x
-}
-
-fun Any.string() = this as String
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
deleted file mode 100644
index de046bedb9af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log
+++ /dev/null
@@ -1,38 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-  out/production/module/EnumKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Enum.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useBecameNullable.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseBecameNullableKt.class
-End of files
-Compiling files:
-  src/useBecameNullable.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-  out/production/module/EnumKt.class
-End of files
-Compiling files:
-  src/Enum.kt
-  src/useBecameNullable.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt
deleted file mode 100644
index d687098b8b91..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import Enum.*
-
-fun useBecameNullable(e: Enum) {
-    println(e.becameNullable.string())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2
deleted file mode 100644
index 4ab1aab62480..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-import Enum.*
-
-fun useBecameNullable(e: Enum) {
-    println(e.becameNullable?.string())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt
deleted file mode 100644
index 2136b872f620..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import Enum.*
-
-fun useUnchanged(e: Enum) {
-    println(e.unchanged.string())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1
deleted file mode 100644
index 95cd862ae9c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A : AParent()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1
deleted file mode 100644
index 43ad3744b5d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AParent
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt
deleted file mode 100644
index ae6bae15cbfe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class B {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1
deleted file mode 100644
index c6d25347c655..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class B {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log
deleted file mode 100644
index 0f6b6b5ecf72..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log
+++ /dev/null
@@ -1,32 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-  out/production/module/foo/B.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AParent.kt
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/importA.kt
-  src/importAChild.kt
-  src/useB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/UseBKt.class
-  out/production/module/foo/AChild.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/importA.kt
-  src/importAChild.kt
-  src/useB.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt
deleted file mode 100644
index aef89fb30589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt
deleted file mode 100644
index e8361dacb48a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.B
-
-fun useB() {
-    B().f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt
deleted file mode 100644
index bf3e36a22e5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A {
-    val x: Any = "A.x"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1
deleted file mode 100644
index ef7cdda34b68..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-private open class A {
-    val x: Any? = null
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2
deleted file mode 100644
index bcd2e047b17b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A {
-    val x: Any? = null
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt
deleted file mode 100644
index e355a26581ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class B : A()
-
-fun Any.string() = this as String
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
deleted file mode 100644
index 354e1d4a7170..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log
+++ /dev/null
@@ -1,76 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/getA.kt
-  src/getB.kt
-  src/useA.kt
-  src/useB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/BKt.class
-  out/production/module/GetAKt.class
-  out/production/module/GetBKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-  out/production/module/UseBKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/getA.kt
-  src/getB.kt
-  src/useA.kt
-  src/useB.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-'public' function exposes its 'private-in-file' return type A
-Cannot access 'A': it is private in file
-Cannot access 'A': it is private in file
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
-Cannot access 'x': it is invisible (private in a supertype) in 'B'
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/getA.kt
-  src/getB.kt
-  src/useA.kt
-  src/useB.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
-Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any?
-
-================ Step #3 =================
-
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/getA.kt
-  src/getB.kt
-  src/useA.kt
-  src/useB.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt
deleted file mode 100644
index bd04874b85bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt
deleted file mode 100644
index ff08b7154a6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getB() = B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt
deleted file mode 100644
index b95f4898b1d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    getA().x.string()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3
deleted file mode 100644
index cd641610dcd8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    getA().x?.string()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt
deleted file mode 100644
index e401442bd9e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useB() {
-    getB().x.string()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3
deleted file mode 100644
index 804b2c6279a4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useB() {
-    getB().x?.string()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt
deleted file mode 100644
index 7f0bdfbb9ea7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt
deleted file mode 100644
index b500f9774b2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1
deleted file mode 100644
index 711103786bc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-open class B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2
deleted file mode 100644
index b500f9774b2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-open class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt
deleted file mode 100644
index bca481db1062..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C : B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt
deleted file mode 100644
index b1da90d456f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt
+++ /dev/null
@@ -1 +0,0 @@
-class D : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/build.log
deleted file mode 100644
index 96b6b8397e0e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/build.log
+++ /dev/null
@@ -1,53 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/C.kt
-  src/callUseAWithB.kt
-  src/callUseAWithC.kt
-  src/getB.kt
-  src/getC.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/C.class
-  out/production/module/CallUseAWithBKt.class
-  out/production/module/CallUseAWithCKt.class
-  out/production/module/GetBKt.class
-  out/production/module/GetCKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/C.kt
-  src/callUseAWithB.kt
-  src/callUseAWithC.kt
-  src/getB.kt
-  src/getC.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is B but A was expected
-Type mismatch: inferred type is C but A was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/callUseAWithB.kt
-  src/callUseAWithC.kt
-  src/getB.kt
-  src/getC.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt
deleted file mode 100644
index edf2d0ba1c2e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun callUseAWithA() {
-    useA(getA())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt
deleted file mode 100644
index f7aff927a73d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun callUseAWithB() {
-    useA(getB())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt
deleted file mode 100644
index f824fe53847d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun callUseAWithC() {
-    useA(getC())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt
deleted file mode 100644
index 20b43d486a65..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun callUseAWithD() {
-    useA(getD())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt
deleted file mode 100644
index bd04874b85bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt
deleted file mode 100644
index ff08b7154a6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getB() = B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt
deleted file mode 100644
index a7f96aa5970d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getC() = C()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt
deleted file mode 100644
index caec5c8b01a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getD() = D()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt
deleted file mode 100644
index 900c1a151f30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt
deleted file mode 100644
index 7f0bdfbb9ea7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt
deleted file mode 100644
index b500f9774b2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1
deleted file mode 100644
index 711103786bc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-open class B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2
deleted file mode 100644
index b500f9774b2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-open class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt
deleted file mode 100644
index bca481db1062..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C : B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt
deleted file mode 100644
index b1da90d456f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt
+++ /dev/null
@@ -1 +0,0 @@
-class D : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
deleted file mode 100644
index 6f8261227cab..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log
+++ /dev/null
@@ -1,56 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/C.class
-  out/production/module/GetListOfBKt.class
-  out/production/module/GetListOfCKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseListOfAKt.class
-  out/production/module/UseListOfAWithListOfBKt.class
-  out/production/module/UseListOfAWithListOfCKt.class
-End of files
-Compiling files:
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfA.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is List<B> but List<A> was expected
-Type mismatch: inferred type is List<C> but List<A> was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfA.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt
deleted file mode 100644
index 80b37b19150c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getListOfA() = listOf(A())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt
deleted file mode 100644
index 081f011bac68..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getListOfB() = listOf(B())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt
deleted file mode 100644
index c18a23d6f9ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getListOfC() = listOf(C())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt
deleted file mode 100644
index 1c038c61e77a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getListOfD() = listOf(D())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
deleted file mode 100644
index 2c5aa067235a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log
+++ /dev/null
@@ -1,52 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/C.class
-  out/production/module/GetListOfBKt.class
-  out/production/module/GetListOfCKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseListOfAWithListOfBKt.class
-  out/production/module/UseListOfAWithListOfCKt.class
-End of files
-Compiling files:
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is List<B> but List<A> was expected
-Type mismatch: inferred type is List<C> but List<A> was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-  src/C.kt
-  src/getListOfB.kt
-  src/getListOfC.kt
-  src/useListOfAWithListOfB.kt
-  src/useListOfAWithListOfC.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt
deleted file mode 100644
index 51fd8ad94cce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun useListOfA(aas: List<A>) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt
deleted file mode 100644
index 3d4d3ce467d7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useListOfAWithListOfA() {
-    useListOfA(getListOfA())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt
deleted file mode 100644
index ef90c64a1ca1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useListOfAWithListOfB() {
-    useListOfA(getListOfB())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt
deleted file mode 100644
index ba71aa7f30c3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useListOfAWithListOfC() {
-    useListOfA(getListOfC())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt
deleted file mode 100644
index 1301fee38e4d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useListOfAWithListOfD() {
-    useListOfA(getListOfD())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt
deleted file mode 100644
index 7f0bdfbb9ea7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt
deleted file mode 100644
index b500f9774b2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new
deleted file mode 100644
index 711103786bc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-open class B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt
deleted file mode 100644
index bca481db1062..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C : B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt
deleted file mode 100644
index b1da90d456f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt
+++ /dev/null
@@ -1 +0,0 @@
-class D : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log
deleted file mode 100644
index 5db82ebd1ef1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log
+++ /dev/null
@@ -1,37 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/C.kt
-  src/getB.kt
-  src/getBorC.kt
-  src/getBorD.kt
-  src/getC.kt
-  src/getCorD.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/C.class
-  out/production/module/GetBKt.class
-  out/production/module/GetBorCKt.class
-  out/production/module/GetBorDKt.class
-  out/production/module/GetCKt.class
-  out/production/module/GetCorDKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/C.kt
-  src/getB.kt
-  src/getBorC.kt
-  src/getBorD.kt
-  src/getC.kt
-  src/getCorD.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt
deleted file mode 100644
index bd04874b85bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt
deleted file mode 100644
index a902fa655c8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-private var aOrDCounter = 0
-
-fun getAorD() = if (aOrDCounter++ % 2 == 0) getA() else getD()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt
deleted file mode 100644
index ff08b7154a6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getB() = B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt
deleted file mode 100644
index ebb91d858b89..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-private var bOrCCounter = 0
-
-fun getBorC() = if (bOrCCounter++ % 2 == 0) getB() else getC()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt
deleted file mode 100644
index b4345b97d57c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-private var bOrDCounter = 0
-
-fun getBorD() = if (bOrDCounter++ % 2 == 0) getB() else getD()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt
deleted file mode 100644
index a7f96aa5970d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getC() = C()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt
deleted file mode 100644
index 2114fc4e7557..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-private var cOrDCounter = 0
-
-fun getCorD() = if (cOrDCounter++ % 2 == 0) getC() else getD()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt
deleted file mode 100644
index caec5c8b01a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getD() = D()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt
deleted file mode 100644
index f002bdf52529..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-interface B
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt
deleted file mode 100644
index e984e7e1d449..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-class D : B {
-    override fun toString(): String = "D"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log
deleted file mode 100644
index b8c9f9cc3d80..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt
deleted file mode 100644
index 589df1ee0642..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-fun use(): String = D().toString()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt
deleted file mode 100644
index 7f0bdfbb9ea7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt
deleted file mode 100644
index 0b8e079aef79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt
+++ /dev/null
@@ -1 +0,0 @@
-class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1
deleted file mode 100644
index 179f0d275843..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-class B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2
deleted file mode 100644
index 0b8e079aef79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-class B : A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log
deleted file mode 100644
index c9d58c7ac6f3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log
+++ /dev/null
@@ -1,51 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/consumeBExtLambda.kt
-  src/consumeBLambda.kt
-  src/useConsumeBExtLambda.kt
-  src/useConsumeBLambda.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/ConsumeBExtLambdaKt.class
-  out/production/module/ConsumeBLambdaKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseConsumeBExtLambdaKt$useConsumeBExtLambda$1.class
-  out/production/module/UseConsumeBExtLambdaKt.class
-  out/production/module/UseConsumeBLambdaKt$useConsumeBLambda$1.class
-  out/production/module/UseConsumeBLambdaKt.class
-End of files
-Compiling files:
-  src/consumeBExtLambda.kt
-  src/consumeBLambda.kt
-  src/useConsumeBExtLambda.kt
-  src/useConsumeBLambda.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is B but A was expected
-Type mismatch: inferred type is B but A was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-  src/consumeBExtLambda.kt
-  src/consumeBLambda.kt
-  src/useConsumeBExtLambda.kt
-  src/useConsumeBLambda.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt
deleted file mode 100644
index e9590d4077bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun consumeA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt
deleted file mode 100644
index 029336ea08c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun consumeBExtLambda(fn: B.()->Unit) {
-    B().fn()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt
deleted file mode 100644
index ae66c833918f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun consumeBLambda(fn: (B)->Unit) {
-    fn(B())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt
deleted file mode 100644
index 78c0903eb1bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useConsumeBExtLambda() {
-    consumeBExtLambda() { consumeA(this) }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt
deleted file mode 100644
index 72631e4c2855..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useConsumeBLambda() {
-    consumeBLambda() { consumeA(it) }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new
deleted file mode 100644
index 6a5b78151159..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/build.log
deleted file mode 100644
index 42d665fcb099..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt
deleted file mode 100644
index 147d93fcd865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/utils.kt
deleted file mode 100644
index 0905e579ffc0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAdded/utils.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun AChild.f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt
deleted file mode 100644
index 6a5b78151159..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new
deleted file mode 100644
index 7a2643852426..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-annotation class Ann
-
-open class A {
-    @Ann
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log
deleted file mode 100644
index 42d665fcb099..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt
deleted file mode 100644
index 147d93fcd865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt
deleted file mode 100644
index 8be756fcb12c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f(x: Any?) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1
deleted file mode 100644
index 1d9db70d68eb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f(x: Any) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2
deleted file mode 100644
index 8be756fcb12c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f(x: Any?) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
deleted file mode 100644
index 09190cc59036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Null can not be a value of a non-null type Any
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt
deleted file mode 100644
index ae703b51dcb1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f(null)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt
deleted file mode 100644
index 6a5b78151159..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new
deleted file mode 100644
index 12f731963ee6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f(x: Int = 0) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log
deleted file mode 100644
index 42d665fcb099..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt
deleted file mode 100644
index 147d93fcd865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt
deleted file mode 100644
index 6a5b78151159..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/build.log
deleted file mode 100644
index 98d534a47f9d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/utils.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt
deleted file mode 100644
index 147d93fcd865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new
deleted file mode 100644
index 0905e579ffc0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun AChild.f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt
deleted file mode 100644
index d58cb4fd74be..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A {
-    open fun f(c: C<Any>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1
deleted file mode 100644
index 5c259647d202..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A {
-    open fun f(c: C<Any?>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2
deleted file mode 100644
index d58cb4fd74be..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A {
-    open fun f(c: C<Any>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt
deleted file mode 100644
index fe031bf8549a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class B : A() {
-    override fun f(c: C<Any>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt
deleted file mode 100644
index 2c74d386ad33..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C<out T>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/build.log
deleted file mode 100644
index 2d9097f7a282..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideExplicit/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'f' overrides nothing
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt
deleted file mode 100644
index f24918ce6421..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-interface A {
-    fun f(c: C<Any>)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt
deleted file mode 100644
index 4686016741cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    fun f(c: C<Any>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1
deleted file mode 100644
index 114a9baca4bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    fun f(c: C<Int>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2
deleted file mode 100644
index 4686016741cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    fun f(c: C<Any>) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt
deleted file mode 100644
index c3556f5d64a5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class BA : B(), A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt
deleted file mode 100644
index 2c74d386ad33..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C<out T>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
deleted file mode 100644
index 6c6fecaba8df..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/overrideImplicit/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/BA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/BA.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/BA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Class 'BA' is not abstract and does not implement abstract member public abstract fun f(c: C<Any>): Unit defined in A
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/B.class
-End of files
-Compiling files:
-  src/B.kt
-  src/BA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt
deleted file mode 100644
index 83aff659f754..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    val x: Any = object {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1
deleted file mode 100644
index a7ed7853d1b7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    val x: Any? = null
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2
deleted file mode 100644
index 83aff659f754..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    val x: Any = object {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
deleted file mode 100644
index 24ab5d17af9f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log
+++ /dev/null
@@ -1,41 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A$x$1.class
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is Any? but Any was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt
deleted file mode 100644
index d654c8a23a2e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    val o: Any = a.x
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt
deleted file mode 100644
index 8357128264a3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-sealed class Base
-
-class A : Base()
-class B : Base()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1
deleted file mode 100644
index 456d3dd6e24d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-sealed class Base
-
-class A : Base()
-class B : Base()
-class C : Base()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log
deleted file mode 100644
index 9595fe1c990e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log
+++ /dev/null
@@ -1,41 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/B.class
-  out/production/module/Base.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Base.kt
-End of files
-Marked as dirty by Kotlin:
-  src/use.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'when' expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/B.class
-  out/production/module/Base.class
-  out/production/module/C.class
-End of files
-Compiling files:
-  src/Base.kt
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt
deleted file mode 100644
index deba19d836a3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun use(x: Base): String =
-        when (x) {
-            is A -> "A"
-            is B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2
deleted file mode 100644
index 3034c5921b3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-import Base.*
-
-fun use(x: Base): String =
-        when (x) {
-            is A -> "A"
-            is B -> "B"
-            is C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt
deleted file mode 100644
index dfc8caa56813..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-sealed class Base
-sealed class Intermediate : Base()
-class Impl1 : Intermediate()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1
deleted file mode 100644
index 388061e91c60..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/Base.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-sealed class Base
-sealed class Intermediate : Base()
-class Impl1 : Intermediate()
-class Impl2 : Intermediate()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log
deleted file mode 100644
index 81586cce7128..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/build.log
+++ /dev/null
@@ -1,41 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Base.class
-  out/production/module/Impl1.class
-  out/production/module/Intermediate.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Base.kt
-End of files
-Marked as dirty by Kotlin:
-  src/use.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'when' expression must be exhaustive, add necessary 'is Impl2' branch or 'else' branch instead
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Base.class
-  out/production/module/Impl1.class
-  out/production/module/Impl2.class
-  out/production/module/Intermediate.class
-End of files
-Compiling files:
-  src/Base.kt
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt
deleted file mode 100644
index 28952f03122a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun use(x: Base): Int =
-        when (x) {
-            is Impl1 -> 1
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2
deleted file mode 100644
index 956ba3a3ac05..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded/use.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-fun use(x: Base): Int =
-        when (x) {
-            is Impl1 -> 1
-            is Impl2 -> 2
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt
deleted file mode 100644
index c09db0c3c10f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-sealed class Base {
-    class A : Base()
-    class B : Base()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1
deleted file mode 100644
index bda48c9d0449..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/Base.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-sealed class Base {
-    class A : Base()
-    class B : Base()
-    class C : Base()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log
deleted file mode 100644
index 251ff3160b76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/build.log
+++ /dev/null
@@ -1,41 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Base$A.class
-  out/production/module/Base$B.class
-  out/production/module/Base.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/Base.kt
-End of files
-Marked as dirty by Kotlin:
-  src/use.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'when' expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Base$A.class
-  out/production/module/Base$B.class
-  out/production/module/Base$C.class
-  out/production/module/Base.class
-End of files
-Compiling files:
-  src/Base.kt
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt
deleted file mode 100644
index dbf02b5d2a47..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import Base.*
-
-fun use(x: Base): String =
-        when (x) {
-            is A -> "A"
-            is B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2
deleted file mode 100644
index 3034c5921b3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded/use.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-import Base.*
-
-fun use(x: Base): String =
-        when (x) {
-            is A -> "A"
-            is B -> "B"
-            is C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt
deleted file mode 100644
index ec5e9d1cc8fd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class A(val x: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1
deleted file mode 100644
index 9da909efd279..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-open class A(val x: Int) {
-    constructor(x: String) : this(x.toInt())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt
deleted file mode 100644
index 8efe9a14b558..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt
+++ /dev/null
@@ -1 +0,0 @@
-class AChild(x: Int) : A(x)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt
deleted file mode 100644
index 2cffa7e5c2e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun A(x: String) = A(x.toInt())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log
deleted file mode 100644
index 26cfbf6c4f32..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build-with-scope-expansion.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/AConstructorFunction.kt
-  src/createAFromInt.kt
-  src/createAFromString.kt
-  src/useA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public constructor A(x: String) defined in A, public fun A(x: String): A defined in root package
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/createAFromInt.kt
-  src/createAFromString.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
deleted file mode 100644
index e6347e4b56c3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public constructor A(x: String) defined in A, public fun A(x: String): A defined in root package
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/AConstructorFunctionKt.class
-End of files
-Cleaning output files:
-  out/production/module/CreateAFromStringKt.class
-End of files
-Compiling files:
-  src/A.kt
-  src/createAFromString.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/createAFromInt.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/AChild.class
-  out/production/module/CreateAFromIntKt.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/createAFromInt.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt
deleted file mode 100644
index e38e845051bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun createAFromInt() = A(5)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt
deleted file mode 100644
index bb9d0e7339f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun createAFromString() = A("5")
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt
deleted file mode 100644
index 900c1a151f30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt
deleted file mode 100644
index 6cd856e3233a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun useAChild(a: AChild) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt
deleted file mode 100644
index 9470d4041292..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A<T : B>(x: T)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1
deleted file mode 100644
index 49eef2dab8cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-class A<T : Any>(x: T)
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt
deleted file mode 100644
index 5f5db2928737..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract class AStarDeclaration {
-    abstract val a: A<*>
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt
deleted file mode 100644
index 292ad03ac71f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class B {
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt
deleted file mode 100644
index 258300503e17..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class CallGetAStar {
-    val a = getAStar()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log
deleted file mode 100644
index 15d6c05aea19..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AStarDeclaration.kt
-  src/CallGetAStar.kt
-  src/getAStar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/AStarDeclaration.class
-  out/production/module/CallGetAStar.class
-  out/production/module/GetAStarKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/AStarDeclaration.kt
-  src/CallGetAStar.kt
-  src/getAStar.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt
deleted file mode 100644
index 9ad7870fce33..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getAStar(): A<*> = A(B())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1
deleted file mode 100644
index 4bd0a1f0e865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A : AParent() {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1
deleted file mode 100644
index 43ad3744b5d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AParent
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log
deleted file mode 100644
index 247b87b2ccd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log
+++ /dev/null
@@ -1,108 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AParent.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1
deleted file mode 100644
index 9e6f6eb3a496..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A<T> {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt
deleted file mode 100644
index 67b2be3d949a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class ATypeParameter<T : A>
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log
deleted file mode 100644
index 4779b934d58f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log
+++ /dev/null
@@ -1,85 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/ImportStarKt.class
-  out/production/module/bar/ReferencedByFqNameKt.class
-  out/production/module/foo/AChild.class
-  out/production/module/foo/AGrandChild.class
-  out/production/module/foo/ATypeParameter.class
-  out/production/module/foo/ClassLiteralKt.class
-  out/production/module/foo/FunctionParameterKt.class
-  out/production/module/foo/GetAKt.class
-  out/production/module/foo/ReturnTypeImplicitKt.class
-  out/production/module/foo/ReturnTypeKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-One type argument expected for class A<T>
-One type argument expected for class A<T>
-One type argument expected for class A<T>
-Not enough information to infer type variable T
-Not enough information to infer type variable T
-Not enough information to infer type variable T
-One type argument expected for class A<T>
-Not enough information to infer type variable T
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/AChild.kt
-  src/AGrandChild.kt
-  src/ATypeParameter.kt
-  src/classLiteral.kt
-  src/functionParameter.kt
-  src/getA.kt
-  src/importA.kt
-  src/importAGrandChild.kt
-  src/importStar.kt
-  src/referencedByFqName.kt
-  src/returnType.kt
-  src/returnTypeImplicit.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt
deleted file mode 100644
index ec9cc9c2bebf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun classLiteral() {
-    A::class
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt
deleted file mode 100644
index ed3a67db2ea2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useA(a: A) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt
deleted file mode 100644
index 5f14d1cf38e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt
deleted file mode 100644
index 4c3c8d8c6a5b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-import foo.*
-
-fun importStarUse() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt
deleted file mode 100644
index 3b5d22bb91fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-fun createAByFqName() {
-    foo.A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt
deleted file mode 100644
index 309f279e048e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAExplicit(): A = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt
deleted file mode 100644
index e3265ea4a734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun getAImplicit() = getA()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt
deleted file mode 100644
index d1126ea0670d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A<in T>(x: T)
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1
deleted file mode 100644
index 2029e4e0fcad..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-class A<out T>(x: T)
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/B.kt
deleted file mode 100644
index 1fae5b2eac07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/B.kt
+++ /dev/null
@@ -1 +0,0 @@
-open class B
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/C.kt
deleted file mode 100644
index a87fb91287a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/C.kt
+++ /dev/null
@@ -1 +0,0 @@
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/D.kt
deleted file mode 100644
index 6bd330004953..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/D.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-class D<T>(x: T) {
-    companion object {
-        val b = D(B())
-        val c = D(C())
-    }
-
-    var a = A(x)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/build.log
deleted file mode 100644
index 6cc3c6ff04e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/build.log
+++ /dev/null
@@ -1,46 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/D.kt
-  src/useA.kt
-  src/useD.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/D$Companion.class
-  out/production/module/D.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-  out/production/module/UseDKt.class
-End of files
-Compiling files:
-  src/D.kt
-  src/useA.kt
-  src/useD.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is A<B> but A<C> was expected
-Type mismatch: inferred type is A<B> but A<C> was expected
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/D.kt
-  src/useA.kt
-  src/useD.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt
deleted file mode 100644
index a2c8197452b7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun useA() {
-    var b: A<B> = A(B())
-    var c: A<C> = A(C())
-    c = b
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2
deleted file mode 100644
index c132cb6b9ed4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-fun useA() {
-    var b: A<B> = A(B())
-    var c: A<C> = A(C())
-    b = c
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt
deleted file mode 100644
index 074bef1752a1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useD() {
-    D.c.a = D.b.a
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2
deleted file mode 100644
index a95a229da861..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useD() {
-    D.b.a = D.c.a
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java
deleted file mode 100644
index 888f27db4e3f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "A";
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new
deleted file mode 100644
index 96ac5cb2bca8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "B";
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log
deleted file mode 100644
index 2345ef9b2bf3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt
deleted file mode 100644
index bb0b5cb52c04..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Deprecated(JavaClass.CONST + JavaClass.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java
deleted file mode 100644
index 888f27db4e3f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "A";
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log
deleted file mode 100644
index 1b429defcb64..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt
deleted file mode 100644
index bb0b5cb52c04..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Deprecated(JavaClass.CONST + JavaClass.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
deleted file mode 100644
index 241aa8b80bd9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/Usage.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Usage.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt
deleted file mode 100644
index cd3256a76121..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new
deleted file mode 100644
index 49b604cd74f2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log
deleted file mode 100644
index 009db0433dc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt
deleted file mode 100644
index 44e612f1bb9f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        const val CONST = "bar"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
deleted file mode 100644
index 033ea714bb90..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt
deleted file mode 100644
index f5d8342d4911..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        @JvmField
-        val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new
deleted file mode 100644
index 247548db1f83..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        @JvmField
-        val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log
deleted file mode 100644
index 009db0433dc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt
deleted file mode 100644
index 203275f21605..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        @JvmField
-        val CONST = "bar"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/build.log
deleted file mode 100644
index 3132368d7eb8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/FooKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/foo.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt
deleted file mode 100644
index 99cec0dbea1a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt
deleted file mode 100644
index fe45df99555f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun bar() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log
deleted file mode 100644
index 3132368d7eb8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/FooKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/foo.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt
deleted file mode 100644
index f23d7f69d2f0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun foo() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/build.log
deleted file mode 100644
index 43e4c87217ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/build.log
+++ /dev/null
@@ -1,18 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/test.kt
-  src/unrelated.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/moduleRenamed/META-INF/moduleRenamed.kotlin_module
-  out/production/moduleRenamed/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt
deleted file mode 100644
index e10864dc9845..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class Foo
-
-fun bar() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/test.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/unrelated.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/unrelated.kt
deleted file mode 100644
index 8a9fa61e315d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/unrelated.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package unrelated
-
-fun doSomething() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/usage.kt
deleted file mode 100644
index 7805cf825468..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/custom/renameModule/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun usage() {
-    Foo()
-    bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java
deleted file mode 100644
index 27d2ec71ec8b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/Ann.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public @interface Ann {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java
deleted file mode 100644
index 32f679b68e03..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public String foo() { return null; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new
deleted file mode 100644
index 5ee4a7132ae4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/JavaClass.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@Ann
-public class JavaClass {
-    public String foo() { return null; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log
deleted file mode 100644
index a9eded761f65..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-SUCCESS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt
deleted file mode 100644
index f3b2ebc5254a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt
deleted file mode 100644
index 89852aeef90e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addAnnotationToJavaClass/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun bar() {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java
deleted file mode 100644
index 32f679b68e03..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public String foo() { return null; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new
deleted file mode 100644
index 256f16bda6d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/JavaClass.java.new
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JavaClass {
-    public String foo() { return null; }
-    public static class Nested {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log
deleted file mode 100644
index 90b32c84535f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: Nested
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt
deleted file mode 100644
index 86fd98ec6cfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/notUsage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import test.*
-
-fun foo(x: Nested) {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt
deleted file mode 100644
index 99c2123ba396..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-class Nested
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt
deleted file mode 100644
index 26c7031039ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/addNestedClass/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-import test.*
-import JavaClass.*
-
-fun bar(x: Nested) {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java
deleted file mode 100644
index 4264b9bfa93c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/Ann.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public @interface Ann {
-    String value() default "1";
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java
deleted file mode 100644
index 5ee4a7132ae4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@Ann
-public class JavaClass {
-    public String foo() { return null; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new
deleted file mode 100644
index 95bbfc31433e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/JavaClass.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@Ann("")
-public class JavaClass {
-    public String foo() { return null; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log
deleted file mode 100644
index a9eded761f65..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-SUCCESS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt
deleted file mode 100644
index f3b2ebc5254a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt
deleted file mode 100644
index 89852aeef90e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/changeAnnotationInJavaClass/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun bar() {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt
deleted file mode 100644
index 7aadff7093a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-import inline1.*
-
-fun f() = h()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt
deleted file mode 100644
index 24893eca0b1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline1
-
-import inline2.*
-
-fun g() = h()
-
-inline fun h() = root { "OK" }
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new
deleted file mode 100644
index 70a33ea0c380..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline1
-
-import inline2.*
-
-fun g() = h() + "!"
-
-inline fun h() = root { "OK" }
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log
deleted file mode 100644
index c838ee57b459..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log
+++ /dev/null
@@ -1,6 +0,0 @@
-================ Step #1 =================
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt
deleted file mode 100644
index 318b4ec6337c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline2
-
-inline fun root(crossinline x: () -> String) = object {
-    fun run() = x()
-}.run()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt
deleted file mode 100644
index 2323594d9417..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt
+++ /dev/null
@@ -1 +0,0 @@
-// IGNORE_BACKEND: JVM
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt
deleted file mode 100644
index 7aadff7093a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-import inline1.*
-
-fun f() = h()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt
deleted file mode 100644
index bca028009691..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline1
-
-import inline2.*
-
-fun g() = root()
-
-inline fun h() = root()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new
deleted file mode 100644
index 439c9780e77f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline1
-
-import inline2.*
-
-fun g() = root() + "!"
-
-inline fun h() = root()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log
deleted file mode 100644
index c838ee57b459..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log
+++ /dev/null
@@ -1,6 +0,0 @@
-================ Step #1 =================
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt
deleted file mode 100644
index 78ce0b545f77..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline2
-
-inline fun root() = "OK"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/Usage.kt
deleted file mode 100644
index 0e9fabbe7c9e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-class Usage {
-    val x = inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/classProperty/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt
deleted file mode 100644
index f628d09621e9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-class Usage {
-    companion object {
-        val x = inline.f()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
deleted file mode 100644
index ac49f401b9fc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage$Companion.class
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/build.log
deleted file mode 100644
index bc387a97aa3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Controller.class
-  out/production/module/usage/UsageKt$async$1.class
-  out/production/module/usage/UsageKt$bar$1.class
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt
deleted file mode 100644
index 9c46b1383d6d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(x: Int): Int {
-    return x - 1
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new
deleted file mode 100644
index 7c3b34f3b5da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(x: Int): Int {
-    return x + 1
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/usage.kt
deleted file mode 100644
index 36035eab76d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/coroutine/usage.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package usage
-import kotlin.coroutines.*
-import kotlin.coroutines.intrinsics.*
-
-fun async(x: suspend Controller.() -> Unit) {
-    x.startCoroutine(Controller(), object : Continuation<Unit> {
-        override val context: CoroutineContext = null!!
-        override fun resumeWith(result: Result<Unit>) {}
-    })
-}
-
-class Controller {
-    suspend fun step(param: Int) = suspendCoroutineUninterceptedOrReturn<Int> { next ->
-        next.resume(param + 1)
-    }
-}
-
-fun bar() {
-    async {
-        val result = step(1)
-        inline.f(result)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/usage.kt
deleted file mode 100644
index 67356ea25532..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/function/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun usage() {
-    val x = inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/Usage.kt
deleted file mode 100644
index 9ea5cdf8614a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/Usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-class Usage {
-    val x: Int
-        get() = inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/build.log
deleted file mode 100644
index 3aee88769ec1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-  src/topLevelUsage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/TopLevelUsageKt.class
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-  src/topLevelUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt
deleted file mode 100644
index 9d20c670526a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package usage
-
-val y: Int
-    get() = inline.f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/build.log
deleted file mode 100644
index 83eeb570cc5d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt$usage$use$1.class
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/usage.kt
deleted file mode 100644
index 4a90efe14ecc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/lambda/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-fun usage() {
-    val use = { inline.f() }
-    use()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/usage.kt
deleted file mode 100644
index fd3041c6fb84..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/localFun/usage.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package usage
-
-fun usage() {
-    fun use() {
-        inline.f()
-    }
-
-    use()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/Usage.kt
deleted file mode 100644
index 56dcd9146975..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/Usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-class Usage {
-    fun use() {
-        val x = inline.f()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/method/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt
deleted file mode 100644
index d321c08ca16b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun usage(x: Int = inline.f()) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt
deleted file mode 100644
index cd3d8b3b67aa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-class Usage(val x: Int = inline.f())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/Usage.kt
deleted file mode 100644
index 104a35719733..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/Usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-class Usage : UsageBase(inline.f())
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt
deleted file mode 100644
index 0febecdaee82..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-abstract class UsageBase(val x: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/superCall/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/Usage.kt
deleted file mode 100644
index 97ca7c60ca78..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-class Usage(val x: Int) {
-    constructor() : this(inline.f())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/thisCall/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt
deleted file mode 100644
index 5d0fdd64d4d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-object Usage {
-    val x = inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
deleted file mode 100644
index 70b880e5d39e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/Usage.class
-End of files
-Compiling files:
-  src/Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt
deleted file mode 100644
index a242c7c7b324..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new
deleted file mode 100644
index 91d8140528c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f(): Int {
-    return 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt
deleted file mode 100644
index 956c97c4cd4b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-val x = inline.f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt
deleted file mode 100644
index 9e1c744c4464..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt
+++ /dev/null
@@ -1 +0,0 @@
-internal inline fun foo() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new
deleted file mode 100644
index b8f030e80004..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/inline.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-internal inline fun foo() = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log
deleted file mode 100644
index c93f14814607..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/inline.kt
-  src/usage.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt
deleted file mode 100644
index 40dfa767a58d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/usage.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun usage() = foo()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt
deleted file mode 100644
index e3a7cc6b3fc3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/dummy.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-fun dontUseF() {
-    println("Don't use f")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt
deleted file mode 100644
index e1cb1b83d71a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-fun doo(fn: () -> Unit) = fn()
-
-inline fun f() {
-    doo {
-        println("i'm inline function")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new
deleted file mode 100644
index c2b9f2308460..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/inline.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-fun doo(fn: () -> Unit) = fn()
-
-inline fun f() {
-    doo {
-        println("I'm an inline function!")
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log
deleted file mode 100644
index c93f14814607..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/inline.kt
-  src/usage.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt
deleted file mode 100644
index 6bbb80d5f30f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/js/inlineFunctionLocalDeclarationChanges/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    inline.f()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt
deleted file mode 100644
index 3dbcdef91ed8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-public class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/A.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/build.log
deleted file mode 100644
index 162050ab436d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
deleted file mode 100644
index 1572f363a502..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    class-attributes.tab
-    class-fq-name-to-source.tab
-    internal-name-to-source.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/build.log
deleted file mode 100644
index 36f39a9eda4c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/B.class
-  out/production/module/C.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/main.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
deleted file mode 100644
index 6ece0df56da2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    class-attributes.tab
-    class-fq-name-to-source.tab
-    internal-name-to-source.tab
-    proto.tab
-    source-to-classes.tab
-    subtypes.tab
-    supertypes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt
deleted file mode 100644
index e425830313df..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-open class A
-
-open class B : A()
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/build.log
deleted file mode 100644
index f7eb1e89b43a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/constant/ConstantKt.class
-End of files
-Compiling files:
-  src/constant.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt
deleted file mode 100644
index d86254c61452..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package constant
-
-const val X = 10
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
deleted file mode 100644
index e068bc3b7245..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package constant
-
-const val X = 11
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
deleted file mode 100644
index 1232a083a327..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    constants.tab
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/usage.kt
deleted file mode 100644
index 4a70ee330652..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/constant/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package usage
-
-fun f(): Int =
-        constant.X
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/build.log
deleted file mode 100644
index 7ea9f6c39408..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UtilsKt.class
-End of files
-Compiling files:
-  src/utils.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
deleted file mode 100644
index ac0c703af908..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt
deleted file mode 100644
index 7417787603f2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/function/utils.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
deleted file mode 100644
index 97b4eb9d00e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    inline-functions.tab
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt
deleted file mode 100644
index 406f6ee43886..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-inline fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new
deleted file mode 100644
index 1b69393d6eb9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-inline fun f() {
-    println("changed")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt
deleted file mode 100644
index 4e9d8fe8eb21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-inline fun use() {
-    inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log
deleted file mode 100644
index 21a15a07f99b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
deleted file mode 100644
index 97b4eb9d00e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    inline-functions.tab
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt
deleted file mode 100644
index 406f6ee43886..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-inline fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java
deleted file mode 100644
index 61ff2abcc95e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class A {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/build.log
deleted file mode 100644
index 313a544ce5b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt
deleted file mode 100644
index 6feaf1a52c0b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-kotlin-data-container
-Module 'module' production
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
deleted file mode 100644
index 45266a8def62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/constant/ConstantKt.class
-End of files
-Compiling files:
-  src/constant.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
deleted file mode 100644
index 5bb00251bf35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package constant
-
-val X = 10
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
deleted file mode 100644
index 922484aea23a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package constant
-
-val X = 11
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
deleted file mode 100644
index ac0c703af908..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-kotlin-data-container
-    data-container-format-version.txt
-    counters.tab
-    file-to-id.tab
-    id-to-file.tab
-    lookups.tab
-Module 'module' production
-    format-version.txt
-    jvm-build-meta-info.txt
-    internal-name-to-source.tab
-    package-parts.tab
-    proto.tab
-    source-to-classes.tab
-Module 'module' tests
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
deleted file mode 100644
index 4a70ee330652..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package usage
-
-fun f(): Int =
-        constant.X
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/bar.kt
deleted file mode 100644
index 3798ab0118a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/bar.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-// To force creating bar package
-
-/*p:bar(Dummy)*/private class Dummy
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/build.log
deleted file mode 100644
index 536cf2596770..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/constraints.kt
-  src/foo.kt
-  src/usages.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/usages.kt
-Exit code: OK
-
-==== STEP 2 ====
-Compiling files:
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  Unresolved reference: vala
-  Unresolved reference: vara
-  Unresolved reference: foo
-  Unresolved reference: bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt
deleted file mode 100644
index f92324e88e99..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun <T : /*p:foo*/A?, B : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Iterable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, C, D> test()
-        where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, D : B
-{}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/foo.kt
deleted file mode 100644
index e9130baea289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/foo.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/class A {
-    val a = /*p:kotlin(Int)*/1
-    var b = /*p:kotlin(String)*/""
-
-    val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
-        get() = /*c:foo.A p:kotlin(String)*/b
-
-    var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd"
-        get() = /*p:kotlin(String)*/field
-        set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v }
-
-    fun foo() {
-        /*c:foo.A p:kotlin(Int)*/a
-        /*c:foo.A*/foo()
-        /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a
-        /*p:foo(A)*/this./*c:foo.A*/foo()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    }
-
-    class B {
-        val a = /*p:kotlin(Int)*/1
-
-        companion object CO {
-            fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-        }
-    }
-
-    inner class C
-
-    companion object {
-        val a = /*p:kotlin(Int)*/1
-        fun baz() {}
-    }
-
-    object O {
-        var v = /*p:kotlin(String)*/"vvv"
-    }
-}
-
-/*p:foo*/interface I {
-    var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int
-    fun foo()
-
-    class NI
-}
-
-/*p:foo*/object Obj : /*p:foo*/I {
-    override var a = /*p:kotlin(Int)*/1
-    override fun foo() {}
-    val b = /*p:kotlin(Int)*/1
-    fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I
-}
-
-/*p:foo*/enum class E {
-    X,
-    Y;
-
-    val a = /*p:kotlin(Int)*/1
-    fun foo() {
-        /*c:foo.E p:kotlin(Int)*/a
-        /*c:foo.E p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a
-        /*c:foo.E*/foo()
-        /*c:foo.E p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt
deleted file mode 100644
index 35af6681592f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2
deleted file mode 100644
index ebacc22616ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2
+++ /dev/null
@@ -1,54 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) {
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara()
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar()
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/build.log
deleted file mode 100644
index a03aebe0d5f7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/build.log
+++ /dev/null
@@ -1,16 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/comparison.kt
-  src/declarations.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/comparison.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt
deleted file mode 100644
index 59eb2b987ebc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/comparison.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/declarations.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/declarations.kt
deleted file mode 100644
index 08ab50385d4f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/declarations.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/class A {
-    operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-    operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-    operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-    operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1
-    operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
-    operator fun invoke() {}
-
-    operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0
-
-    operator fun component1() = /*p:foo.bar(A)*/this
-
-    operator fun iterator() = /*p:foo.bar(A)*/this
-    operator fun next() = /*p:foo.bar(A)*/this
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:kotlin(Int)*/0
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!!
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt
deleted file mode 100644
index 66cd987ff610..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package foo.bar
-
-/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty
-
-/*p:foo.bar*/class D1 {
-    operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-
-/*p:foo.bar(D2)*/open class D2 {
-    operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this
-
-/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
-    operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this
-}
-
-
-/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-
-/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-
-/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3()
-/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt
deleted file mode 100644
index c3dda9f895f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {
-    var d = /*p:foo.bar(A)*/a
-
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++
-    /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/--
-    /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d
-
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b
-    /*c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a
-
-    // for val
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b
-
-    // for var
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt
deleted file mode 100644
index 0fb034380d40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) {
-    /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2]
-
-    /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a
-    /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a
-
-    /*c:foo.bar.A(invoke)*/a()
-    /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1)
-
-    val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a;
-
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a);
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na);
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/conventions/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/build.log
deleted file mode 100644
index 74d3d30ab541..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/genericType.kt
-  src/inferredType.kt
-  src/lambdaParameterType.kt
-  src/localInnerClassType.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/genericType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/genericType.kt
deleted file mode 100644
index dd0722893b2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/genericType.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package foo
-
-// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25
-
-/*p:foo*/fun <T> identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T
-
-/*p:foo*/fun <T> compute(f: () -> T) {
-    val result = f()
-}
-
-/*p:foo*/class Bar<T>(val t: T) {
-    init {
-        val a = /*c:foo.Bar c:foo.Bar(T)*/t
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/inferredType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/inferredType.kt
deleted file mode 100644
index cc97bd76b8b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/inferredType.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package foo
-
-/*p:foo(A)*/open class A
-/*p:foo*/class B : /*p:foo*/A()
-
-/*p:foo*/fun getA() = /*p:foo*/A()
-/*p:foo*/fun getB() = /*p:foo*/B()
-
-/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A())
-/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B())
-
-/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/A>) {}
-/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/B>) {}
-
-/*p:foo*/fun testInferredType() {
-    /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
-    /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-    /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt
deleted file mode 100644
index 4040103b8ae4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/*p:foo*/class C
-
-/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
-/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
-
-/*p:foo*/fun testLambdaParameterType() {
-    /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it }
-    /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt
deleted file mode 100644
index c9e10d74f076..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/expressionType/localInnerClassType.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-/*p:foo*/fun bar() {
-    class A {
-        inner class B
-    }
-
-    val b = A().B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/bar.kt
deleted file mode 100644
index ddac0faf273b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-package bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/build.log
deleted file mode 100644
index dc6965bc972b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/build.log
+++ /dev/null
@@ -1,5 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt(no lookups)
-  src/locals.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/locals.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/locals.kt
deleted file mode 100644
index e268cb9be520..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/localDeclarations/locals.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package local.declarations
-
-import bar.*
-
-/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Any) /*p:kotlin(Int)*/{
-    /*p:kotlin(Any) p:kotlin(String)*/p.toString()
-
-    val a = /*p:kotlin(Int)*/1
-    val b = /*p:kotlin(Int)*/a
-    fun localFun() = /*p:kotlin(Int)*/b
-    fun /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
-
-    abstract class LocalI {
-        abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int
-        abstract fun foo()
-    }
-
-    class LocalC : LocalI() {
-        override var a = /*p:kotlin(Int)*/1
-
-        override fun foo() {}
-
-        var b = /*p:kotlin(String)*/"bbb"
-
-        fun bar() = /*p:kotlin(Int)*/b
-    }
-
-    val o = object {
-        val a = /*p:kotlin(String)*/"aaa"
-        fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI
-    }
-
-    /*p:kotlin(Int)*/localFun()
-    /*p:kotlin(Int)*/1.localExtFun()
-
-    val c = LocalC()
-    /*p:kotlin(Int)*/c.a
-    /*p:kotlin(String)*/c.b
-    c.foo()
-    /*p:kotlin(Int)*/c.bar()
-
-    val i: LocalI = c
-    /*p:kotlin(Int)*/i.a
-    i.foo()
-
-    /*p:kotlin(String)*/o.a
-    val ii = o.foo()
-    /*p:kotlin(Int)*/ii.a
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt
deleted file mode 100644
index d69fc70de05e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/bar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-/*p:bar*/class A
-
-/*p:bar*/class B
-
-/*p:bar*/object O
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt
deleted file mode 100644
index b6af61fb0dbb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/baz.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package baz
-
-/*p:baz*/class A
-
-/*p:baz*/class B
-
-/*p:baz*/class C
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/build.log
deleted file mode 100644
index 6c6710fba2c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/baz.kt
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt
deleted file mode 100644
index c39a73ac0841..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package foo
-
-import bar.*
-/*p:baz(C)*/import baz.C
-
-/*p:foo*/val a = /*p:bar p:foo*/A()
-/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B()
-
-/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{
-    /*p:bar(A) p:foo*/a
-    /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B()
-}
-
-/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:bar p:foo*/B>, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{
-    /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b
-    /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt
deleted file mode 100644
index cf303aa5f0d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/*p:foo*/interface MyInterface
-
-/*p:foo*/class MyClass : /*p:foo*/MyInterface
-
-/*p:foo*/enum class MyEnum
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/packageDeclarations/foo2.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/build.log
deleted file mode 100644
index 5aaa84efb3d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/build.log
+++ /dev/null
@@ -1,4 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/main.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/main.kt
deleted file mode 100644
index 68363c90532b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/js/simple/main.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String>) {
-    val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int>
-    val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt
deleted file mode 100644
index 3798ab0118a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-// To force creating bar package
-
-/*p:bar(Dummy)*/private class Dummy
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log
deleted file mode 100644
index 536cf2596770..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/constraints.kt
-  src/foo.kt
-  src/usages.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/usages.kt
-Exit code: OK
-
-==== STEP 2 ====
-Compiling files:
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  Unresolved reference: vala
-  Unresolved reference: vara
-  Unresolved reference: foo
-  Unresolved reference: bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
deleted file mode 100644
index f92324e88e99..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun <T : /*p:foo*/A?, B : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Iterable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, C, D> test()
-        where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable</*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number>, D : B
-{}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
deleted file mode 100644
index 8ffc37cfc1d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/class A {
-    val a = /*p:kotlin(Int)*/1
-    var b = /*p:kotlin(String)*/""
-
-    val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
-        get() = /*c:foo.A p:kotlin(String)*/b
-
-    var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd"
-        get() = /*p:kotlin(String)*/field
-        set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v }
-
-    fun foo() {
-        /*c:foo.A p:kotlin(Int)*/a
-        /*c:foo.A*/foo()
-        /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a
-        /*p:foo(A)*/this./*c:foo.A*/foo()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    }
-
-    class B {
-        val a = /*p:kotlin(Int)*/1
-
-        companion object CO {
-            fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-        }
-    }
-
-    inner class C
-
-    companion object {
-        val a = /*p:kotlin(Int)*/1
-        fun baz() {}
-    }
-
-    object O {
-        var v = /*p:kotlin(String)*/"vvv"
-    }
-}
-
-/*p:foo*/interface I {
-    var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int
-    fun foo()
-
-    class NI
-}
-
-/*p:foo*/object Obj : /*p:foo*/I {
-    override var a = /*p:kotlin(Int)*/1
-    override fun foo() {}
-    val b = /*p:kotlin(Int)*/1
-    fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I
-}
-
-/*p:foo*/enum class E {
-    X,
-    Y;
-
-    val a = /*p:kotlin(Int)*/1
-    fun foo() {
-        /*c:foo.E p:kotlin(Int)*/a
-        /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a
-        /*c:foo.E c:kotlin.Enum*/foo()
-        /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E c:kotlin.Enum*/foo()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
deleted file mode 100644
index 21d55ee2cdf8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
deleted file mode 100644
index afa0f3ed148c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2
+++ /dev/null
@@ -1,54 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) {
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara()
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo()
-    /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo
-    /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar()
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/build.log
deleted file mode 100644
index a03aebe0d5f7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/build.log
+++ /dev/null
@@ -1,16 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/comparison.kt
-  src/declarations.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/comparison.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
deleted file mode 100644
index 59eb2b987ebc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
deleted file mode 100644
index 08ab50385d4f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/class A {
-    operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-    operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-    operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-    operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1
-    operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
-    operator fun invoke() {}
-
-    operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0
-
-    operator fun component1() = /*p:foo.bar(A)*/this
-
-    operator fun iterator() = /*p:foo.bar(A)*/this
-    operator fun next() = /*p:foo.bar(A)*/this
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:kotlin(Int)*/0
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!!
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
deleted file mode 100644
index 66cd987ff610..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package foo.bar
-
-/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty
-
-/*p:foo.bar*/class D1 {
-    operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-
-/*p:foo.bar(D2)*/open class D2 {
-    operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {}
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this
-
-/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
-    operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this
-}
-
-
-/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-
-/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-
-/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3()
-/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
deleted file mode 100644
index c3dda9f895f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {
-    var d = /*p:foo.bar(A)*/a
-
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++
-    /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/--
-    /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d
-
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b
-    /*c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a
-
-    // for val
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b
-
-    // for var
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
deleted file mode 100644
index 0fb034380d40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) {
-    /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2]
-
-    /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a
-    /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a
-
-    /*c:foo.bar.A(invoke)*/a()
-    /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1)
-
-    val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a;
-
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a);
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na);
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/build.log
deleted file mode 100644
index 74d3d30ab541..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/genericType.kt
-  src/inferredType.kt
-  src/lambdaParameterType.kt
-  src/localInnerClassType.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
deleted file mode 100644
index dd0722893b2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package foo
-
-// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25
-
-/*p:foo*/fun <T> identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T
-
-/*p:foo*/fun <T> compute(f: () -> T) {
-    val result = f()
-}
-
-/*p:foo*/class Bar<T>(val t: T) {
-    init {
-        val a = /*c:foo.Bar c:foo.Bar(T)*/t
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
deleted file mode 100644
index cc97bd76b8b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package foo
-
-/*p:foo(A)*/open class A
-/*p:foo*/class B : /*p:foo*/A()
-
-/*p:foo*/fun getA() = /*p:foo*/A()
-/*p:foo*/fun getB() = /*p:foo*/B()
-
-/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A())
-/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B())
-
-/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/A>) {}
-/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List</*p:foo*/B>) {}
-
-/*p:foo*/fun testInferredType() {
-    /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
-    /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-    /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
deleted file mode 100644
index 4040103b8ae4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/*p:foo*/class C
-
-/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
-/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {}
-
-/*p:foo*/fun testLambdaParameterType() {
-    /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it }
-    /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
deleted file mode 100644
index c9e10d74f076..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-/*p:foo*/fun bar() {
-    class A {
-        inner class B
-    }
-
-    val b = A().B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt
deleted file mode 100644
index ddac0faf273b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-package bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log
deleted file mode 100644
index dc6965bc972b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log
+++ /dev/null
@@ -1,5 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt(no lookups)
-  src/locals.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
deleted file mode 100644
index 59056dd2de21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package local.declarations
-
-import bar.*
-
-/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Any) /*p:kotlin(Int)*/{
-    /*p:kotlin(Any) p:kotlin(String)*/p./*c:kotlin.Any*/toString()
-
-    val a = /*p:kotlin(Int)*/1
-    val b = /*p:kotlin(Int)*/a
-    fun localFun() = /*p:kotlin(Int)*/b
-    fun /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
-
-    abstract class LocalI {
-        abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int
-        abstract fun foo()
-    }
-
-    class LocalC : LocalI() {
-        override var a = /*p:kotlin(Int)*/1
-
-        override fun foo() {}
-
-        var b = /*p:kotlin(String)*/"bbb"
-
-        fun bar() = /*p:kotlin(Int)*/b
-    }
-
-    val o = object {
-        val a = /*p:kotlin(String)*/"aaa"
-        fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI
-    }
-
-    /*p:kotlin(Int)*/localFun()
-    /*p:kotlin(Int)*/1./*c:kotlin.Int c:kotlin.Number*/localExtFun()
-
-    val c = LocalC()
-    /*p:kotlin(Int)*/c.a
-    /*p:kotlin(String)*/c.b
-    c.foo()
-    /*p:kotlin(Int)*/c.bar()
-
-    val i: LocalI = c
-    /*p:kotlin(Int)*/i.a
-    i.foo()
-
-    /*p:kotlin(String)*/o.a
-    val ii = o.foo()
-    /*p:kotlin(Int)*/ii.a
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt
deleted file mode 100644
index d69fc70de05e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-/*p:bar*/class A
-
-/*p:bar*/class B
-
-/*p:bar*/object O
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt
deleted file mode 100644
index b6af61fb0dbb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package baz
-
-/*p:baz*/class A
-
-/*p:baz*/class B
-
-/*p:baz*/class C
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log
deleted file mode 100644
index 6c6710fba2c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/baz.kt
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
deleted file mode 100644
index c39a73ac0841..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package foo
-
-import bar.*
-/*p:baz(C)*/import baz.C
-
-/*p:foo*/val a = /*p:bar p:foo*/A()
-/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B()
-
-/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{
-    /*p:bar(A) p:foo*/a
-    /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B()
-}
-
-/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:bar p:foo*/B>, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{
-    /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b
-    /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt
deleted file mode 100644
index cf303aa5f0d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/*p:foo*/interface MyInterface
-
-/*p:foo*/class MyClass : /*p:foo*/MyInterface
-
-/*p:foo*/enum class MyEnum
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/build.log
deleted file mode 100644
index 5aaa84efb3d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/build.log
+++ /dev/null
@@ -1,4 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/main.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/main.kt
deleted file mode 100644
index 68363c90532b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jsKlib/simple/main.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String>) {
-    val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array</*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int>
-    val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/C.java
deleted file mode 100644
index 1a2e3e0cfc4e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/C.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package bar;
-
-public class C {
-    public void foo(SAMInterface x) {}
-    public static void bar(SAMInterface x) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java
deleted file mode 100644
index a2c125260579..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/bar/SAMInterface.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar;
-
-public interface SAMInterface {
-    void apply(String x);
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/build.log
deleted file mode 100644
index 43e6a28a6c48..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  No value passed for parameter 'x'
-  No value passed for parameter 'x'
-  No value passed for parameter 'function'
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/usages.kt
deleted file mode 100644
index c39722b7e041..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/SAM/usages.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package foo
-/*p:bar(C)*/import bar.C
-/*p:bar(SAMInterface)*/import bar.SAMInterface
-
-/*p:foo*/fun foo(c: /*p:bar*/C) /*p:bar(SAMInterface)*/{
-    /*p:bar(C)*/c./*c:bar.C c:bar.C(getFOO) c:bar.C(getFoo) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/foo()
-    /*p:bar(C)*/c./*c:bar.C c:bar.SAMInterface(<SAM-CONSTRUCTOR>)*/foo /*p:kotlin(Function1) p:kotlin(String)*/{  }
-
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/bar()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C c:bar.SAMInterface(<SAM-CONSTRUCTOR>)*/bar /*p:kotlin(Function1) p:kotlin(String)*/{}
-
-    /*c:bar.SAMInterface(<SAM-CONSTRUCTOR>) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/SAMInterface()
-    /*c:bar.SAMInterface(<SAM-CONSTRUCTOR>) p:bar*/SAMInterface /*p:kotlin(Function1) p:kotlin(String)*/{}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt
deleted file mode 100644
index 3798ab0118a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/bar.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-// To force creating bar package
-
-/*p:bar(Dummy)*/private class Dummy
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/build.log
deleted file mode 100644
index 536cf2596770..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/constraints.kt
-  src/foo.kt
-  src/usages.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/usages.kt
-Exit code: OK
-
-==== STEP 2 ====
-Compiling files:
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  Unresolved reference: vala
-  Unresolved reference: vara
-  Unresolved reference: foo
-  Unresolved reference: bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
deleted file mode 100644
index 400f192507bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/constraints.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun <T : /*p:foo*/A?, B : /*p:foo p:kotlin.collections*/Iterable</*p:foo p:kotlin*/Number>, C, D> test()
-        where C : /*p:foo p:kotlin*/Number, C : /*p:foo p:kotlin*/Comparable</*p:foo p:kotlin*/Number>, D : B
-{}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
deleted file mode 100644
index af279c0683bf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/class A {
-    val a = /*p:kotlin(Int)*/1
-    var b = /*p:kotlin(String)*/""
-
-    val c: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String
-        get() = /*c:foo.A p:kotlin(String)*/b
-
-    var d: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String = /*p:kotlin(String)*/"ddd"
-        get() = /*p:kotlin(String)*/field
-        set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v }
-
-    fun foo() {
-        /*c:foo.A p:kotlin(Int)*/a
-        /*c:foo.A*/foo()
-        /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a
-        /*p:foo(A)*/this./*c:foo.A*/foo()
-        /*c:foo.A c:foo.A(getBAZ) c:foo.A(getBaz) c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz()
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a
-        /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    }
-
-    class B {
-        val a = /*p:kotlin(Int)*/1
-
-        companion object CO {
-            fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:foo p:kotlin*/Int) {}
-        }
-    }
-
-    inner class C
-
-    companion object {
-        val a = /*p:kotlin(Int)*/1
-        fun baz() {}
-    }
-
-    object O {
-        var v = /*p:kotlin(String)*/"vvv"
-    }
-}
-
-/*p:foo*/interface I {
-    var a: /*c:foo.I p:foo p:kotlin*/Int
-    fun foo()
-
-    class NI
-}
-
-/*p:foo*/object Obj : /*p:foo*/I {
-    override var a = /*p:kotlin(Int)*/1
-    override fun foo() {}
-    val b = /*p:kotlin(Int)*/1
-    fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I
-}
-
-/*p:foo*/enum class E {
-    X,
-    Y;
-
-    val a = /*p:kotlin(Int)*/1
-    fun foo() {
-        /*c:foo.E p:kotlin(Int)*/a
-        /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a
-        /*c:foo.E*/foo()
-        /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
deleted file mode 100644
index 73cde312c1fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
deleted file mode 100644
index 449442ab630d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2
+++ /dev/null
@@ -1,54 +0,0 @@
-package foo
-
-import bar.*
-
-/*p:foo*/fun usages(i: /*p:foo*/I) {
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value"
-    /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo()
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1)
-    /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1)
-    /*c:foo.A(Companion) p:foo*/A
-    /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz()
-    /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion
-    /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz()
-    /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O
-    /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK"
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVALA) c:foo.A.Companion(getVala) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala
-    /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVARA) c:foo.A.Companion(getVara) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara()
-
-    /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a
-    /*p:foo*/Obj./*c:foo.Obj*/foo()
-    var ii: /*p:foo*/I = /*p:foo*/Obj
-    /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a
-    /*p:foo(I)*/ii./*c:foo.I*/foo()
-    /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b
-    val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar()
-    /*p:foo(I)*/iii./*c:foo.I*/foo()
-
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values()
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"")
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo
-    /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar()
-}
-
-/*p:foo*/fun classifiers(
-        a: /*p:foo*/A,
-        ab: /*p:foo*/A./*c:foo.A*/B,
-        ac: /*p:foo*/A./*c:foo.A*/C,
-        abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO,
-        aCompanion: /*p:foo*/A./*c:foo.A*/Companion,
-        aO: /*p:foo*/A./*c:foo.A*/O,
-        i: /*p:foo*/I,
-        ni: /*p:foo*/I./*c:foo.I*/NI,
-        obj: /*p:foo*/Obj,
-        e: /*p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/build.log
deleted file mode 100644
index a03aebe0d5f7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/build.log
+++ /dev/null
@@ -1,16 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/comparison.kt
-  src/declarations.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/comparison.kt
-  src/delegateProperty.kt
-  src/mathematicalLike.kt
-  src/other.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
deleted file mode 100644
index 480d03ce87e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a
-    /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b
-
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c
-    /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/comparison.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/declarations.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
deleted file mode 100644
index 46c5c01f6114..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/declarations.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/class A {
-    operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this
-    operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Any?) {}
-    operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-    operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/1
-    operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int): /*c:foo.bar.A p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false
-    operator fun invoke() {}
-
-    operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/0
-
-    operator fun component1() = /*p:foo.bar(A)*/this
-
-    operator fun iterator() = /*p:foo.bar(A)*/this
-    operator fun next() = /*p:foo.bar(A)*/this
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin*/Any?) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin*/Int, v: /*p:foo.bar p:kotlin*/Int) {}
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin*/Any): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/true
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin*/Int) {}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin*/Any) = /*p:kotlin(Int)*/0
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!!
-/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
deleted file mode 100644
index cfec1fee4336..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package foo.bar
-
-/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty
-
-/*p:foo.bar*/class D1 {
-    operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin*/Int) {}
-
-/*p:foo.bar(D2)*/open class D2 {
-    operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Int) {}
-}
-
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1
-/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin*/Any?, k: /*p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D2)*/this
-
-/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() {
-    operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this
-}
-
-
-/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getSETValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1()
-
-/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2()
-
-/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3()
-/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
deleted file mode 100644
index 830e7bc7c402..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int) {
-    var d = /*p:foo.bar(A)*/a
-
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++
-    /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d
-    /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(dec)*/--
-    /*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d
-
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMinus) c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b
-    /*c:foo.bar.A(getNOT) c:foo.bar.A(getNot) c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a
-
-    // for val
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDivAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b
-
-    // for var
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getPLUSAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(getMinus) c:foo.bar.A(getMinusAssign) c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(getTIMES) c:foo.bar.A(getTimes) c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.jvm(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b
-    /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) c:foo.bar.A(getDIV) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDiv) c:foo.bar.A(getDivAssign) p:foo.bar(div) p:foo.bar(divAssign) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.jvm(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt
deleted file mode 100644
index f087f7f67442..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) {
-    /*c:foo.bar.A(getSET) c:foo.bar.A(getSet) c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2]
-
-    /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a
-    /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) c:foo.bar.A(getCONTAINS) c:foo.bar.A(getContains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a
-
-    /*c:foo.bar.A(invoke)*/a()
-    /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1)
-
-    val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a;
-
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a);
-    for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getITERATOR) c:foo.bar.A(getIterator) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na);
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/conventions/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/build.log
deleted file mode 100644
index 74d3d30ab541..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/genericType.kt
-  src/inferredType.kt
-  src/lambdaParameterType.kt
-  src/localInnerClassType.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
deleted file mode 100644
index dd0722893b2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package foo
-
-// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25
-
-/*p:foo*/fun <T> identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T
-
-/*p:foo*/fun <T> compute(f: () -> T) {
-    val result = f()
-}
-
-/*p:foo*/class Bar<T>(val t: T) {
-    init {
-        val a = /*c:foo.Bar c:foo.Bar(T)*/t
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
deleted file mode 100644
index 7bc5b359e038..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package foo
-
-/*p:foo(A)*/open class A
-/*p:foo*/class B : /*p:foo*/A()
-
-/*p:foo*/fun getA() = /*p:foo*/A()
-/*p:foo*/fun getB() = /*p:foo*/B()
-
-/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A())
-/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B())
-
-/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin.collections*/List</*p:foo*/A>) {}
-/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin.collections*/List</*p:foo*/B>) {}
-
-/*p:foo*/fun testInferredType() {
-    /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA())
-    /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-    /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB())
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
deleted file mode 100644
index 0aa16b49a294..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/*p:foo*/class C
-
-/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin*/Unit) {}
-/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin*/Unit) {}
-
-/*p:foo*/fun testLambdaParameterType() {
-    /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it }
-    /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
deleted file mode 100644
index c9e10d74f076..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/expressionType/localInnerClassType.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-/*p:foo*/fun bar() {
-    class A {
-        inner class B
-    }
-
-    val b = A().B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/bar/C.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/bar/C.java
deleted file mode 100644
index 5dc47c5b4c8d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/bar/C.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package bar;
-
-import foo.I;
-
-public class C implements I {
-    @Override
-    public void ifunc() {}
-
-    public int field = 1;
-    public void func() {}
-    public class B {}
-
-    public static String sfield = "";
-    public static void sfunc() {}
-    public static class S {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/baz/E.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/baz/E.java
deleted file mode 100644
index 4b7305cfdded..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/baz/E.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package baz;
-
-public enum E {
-    F,
-    S;
-
-    public int field = 1;
-    public void func() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/build.log
deleted file mode 100644
index 1c3639643d75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/build.log
+++ /dev/null
@@ -1,6 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  Unresolved reference: IS
-  Unresolved reference: IS
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/foo/I.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/foo/I.java
deleted file mode 100644
index 0bf443cff80a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/foo/I.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo;
-
-public interface I {
-    void ifunc();
-
-    static String isfield = "";
-    static class IS {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/usages.kt
deleted file mode 100644
index 27dcd9709c76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/java/usages.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package foo
-
-/*p:bar(C)*/import bar.C
-import baz.*
-
-/*p:foo*/fun usages() {
-    val c = /*p:bar*/C()
-
-    /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field
-    /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field = /*p:kotlin(Int)*/2
-    /*p:bar(C)*/c./*c:bar.C*/func()
-    /*c:bar.C(B) p:bar(C)*/c./*c:bar.C*/B()
-
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new"
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfunc()
-    /*c:bar.C(S) p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/S()
-
-    // inherited from I
-    /*p:bar(C)*/c./*c:bar.C*/ifunc()
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/isfield
-    // expected error: Unresolved reference: IS
-    /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/IS()
-
-
-    val i: /*p:foo*/I = /*p:bar(C)*/c
-    /*p:foo(I)*/i./*c:foo.I*/ifunc()
-
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/isfield
-    /*c:foo.I(IS) p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/IS()
-
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F./*c:baz.E*/field
-    /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/S./*c:baz.E*/func()
-}
-
-/*p:foo*/fun classifiers(
-    c: /*p:bar*/C,
-    b: /*p:bar*/C./*c:bar.C*/B,
-    s: /*p:bar*/C./*c:bar.C*/S,
-    cis: /*p:bar*/C./*c:bar.C*/IS,
-    i: /*p:foo*/I,
-    iis: /*p:foo*/I./*c:foo.I*/IS,
-    e: /*p:baz p:foo*/E
-) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt
deleted file mode 100644
index ddac0faf273b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/bar.kt
+++ /dev/null
@@ -1 +0,0 @@
-package bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/build.log
deleted file mode 100644
index dc6965bc972b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/build.log
+++ /dev/null
@@ -1,5 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt(no lookups)
-  src/locals.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
deleted file mode 100644
index e736a16e41ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package local.declarations
-
-import bar.*
-
-/*p:local.declarations*/fun f(p: /*p:kotlin p:local.declarations*/Any) /*p:kotlin(Int)*/{
-    /*p:kotlin(Any) p:kotlin(String)*/p.toString()
-
-    val a = /*p:kotlin(Int)*/1
-    val b = /*p:kotlin(Int)*/a
-    fun localFun() = /*p:kotlin(Int)*/b
-    fun /*p:kotlin p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun()
-
-    abstract class LocalI {
-        abstract var a: /*p:kotlin p:local.declarations*/Int
-        abstract fun foo()
-    }
-
-    class LocalC : LocalI() {
-        override var a = /*p:kotlin(Int)*/1
-
-        override fun foo() {}
-
-        var b = /*p:kotlin(String)*/"bbb"
-
-        fun bar() = /*p:kotlin(Int)*/b
-    }
-
-    val o = object {
-        val a = /*p:kotlin(String)*/"aaa"
-        fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI
-    }
-
-    /*p:kotlin(Int)*/localFun()
-    /*p:kotlin(Int)*/1./*c:kotlin.Int(getLOCALExtFun) c:kotlin.Int(getLocalExtFun)*/localExtFun()
-
-    val c = LocalC()
-    /*p:kotlin(Int)*/c.a
-    /*p:kotlin(String)*/c.b
-    c.foo()
-    /*p:kotlin(Int)*/c.bar()
-
-    val i: LocalI = c
-    /*p:kotlin(Int)*/i.a
-    i.foo()
-
-    /*p:kotlin(String)*/o.a
-    val ii = o.foo()
-    /*p:kotlin(Int)*/ii.a
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt
deleted file mode 100644
index d69fc70de05e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/bar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package bar
-
-/*p:bar*/class A
-
-/*p:bar*/class B
-
-/*p:bar*/object O
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt
deleted file mode 100644
index b6af61fb0dbb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/baz.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package baz
-
-/*p:baz*/class A
-
-/*p:baz*/class B
-
-/*p:baz*/class C
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log
deleted file mode 100644
index 6c6710fba2c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/bar.kt
-  src/baz.kt
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
-
-==== STEP 1 ====
-Compiling files:
-  src/foo1.kt
-  src/foo2.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
deleted file mode 100644
index ac6c55f0a977..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package foo
-
-import bar.*
-/*p:baz(C)*/import baz.C
-
-/*p:foo*/val a = /*p:bar p:foo*/A()
-/*p:foo*/var b: /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B()
-
-/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{
-    /*p:bar(A) p:foo*/a
-    /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B()
-}
-
-/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array</*p:bar p:foo*/B>, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{
-    /*c:foo.MyClass c:foo.MyClass(getB) p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b
-    /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt
deleted file mode 100644
index cf303aa5f0d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-/*p:foo*/interface MyInterface
-
-/*p:foo*/class MyClass : /*p:foo*/MyInterface
-
-/*p:foo*/enum class MyEnum
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/packageDeclarations/foo2.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/build.log
deleted file mode 100644
index 5aaa84efb3d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/build.log
+++ /dev/null
@@ -1,4 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/main.kt
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/main.kt
deleted file mode 100644
index 09f59f1743ce..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/simple/main.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo.bar
-
-/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin*/Array</*p:foo.bar p:kotlin*/String>) {
-    val f: /*p:foo.bar p:kotlin*/Array</*p:foo.bar p:kotlin*/Int>
-    val s: /*p:foo.bar p:kotlin*/String
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java
deleted file mode 100644
index 58cb77be2d0b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/JavaClass.java
+++ /dev/null
@@ -1,26 +0,0 @@
-public class JavaClass {
-    public int getFoo() {
-        return 1;
-    }
-
-    public String getBar() {
-        return "";
-    }
-
-    public void setBar(String s) {
-    }
-
-    public int getBazBaz() {
-        return 1;
-    }
-
-    public int getBAZBaz() {
-        return 1;
-    }
-
-    public void setBazBaz(int i) {
-    }
-
-    public void setBoo(int i) {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
deleted file mode 100644
index dc184a951f98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-/*p:<root>(JavaClass)*/import JavaClass
-
-/*p:foo*/class KotlinClass : /*p:<root>*/JavaClass() {
-    override fun getFoo() = /*p:kotlin(Int)*/2
-    fun setFoo(i: /*c:JavaClass c:foo.KotlinClass p:foo p:kotlin*/Int) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
deleted file mode 100644
index 28132674392e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-==== INITIAL BUILD ====
-Compiling files:
-  src/KotlinClass.kt
-  src/usages.kt
-Exit code: COMPILATION_ERROR
-  Unresolved reference: setFoo
-  Val cannot be reassigned
-  Unresolved reference: bazBaz
-  Unresolved reference: bazBaz
-  Unresolved reference: boo
-  Unresolved reference: bazBaz
-  Unresolved reference: bazBaz
-  Unresolved reference: boo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
deleted file mode 100644
index 89e840a68000..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package foo.bar
-
-/*p:<root>(JavaClass)*/import JavaClass
-/*p:foo(KotlinClass)*/import foo.KotlinClass
-
-/*p:foo.bar*/fun test() {
-    val j = /*p:<root>*/JavaClass()
-    val k = /*p:foo*/KotlinClass()
-
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo()
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getSETFoo) c:JavaClass(getSetFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/setFoo(2)
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2
-    /*p:<root>(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo
-    /*p:<root>(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar
-    /*p:<root>(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/""
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/""
-    /*p:<root>(JavaClass)*/j./*c:JavaClass*/setBoo(2)
-    /*p:<root>(JavaClass)*/j./*c:JavaClass c:JavaClass(getBOO) c:JavaClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:JavaClass c:foo.KotlinClass*/getFoo() // getFoo may be an inner class in JavaClass
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setFoo(2)
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2
-    /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo
-    /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar
-    /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/""
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/""
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setBoo(2)
-    /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBOO) c:foo.KotlinClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/README.md b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/README.md
deleted file mode 100644
index c657b15e57da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Single module tests that run on every platform (currently JVM and JS)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/X.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/X.kt
deleted file mode 100644
index 2e6edf9d0000..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/X.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class X {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Y.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
deleted file mode 100644
index 8fea6dc0dfe3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Y.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class Y {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Z.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
deleted file mode 100644
index e350bdc939c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/Z.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class Z {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/build.log
deleted file mode 100644
index dd0d111cbc86..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-    src/X.kt
-    src/commonX.kt
-    src/useX.kt
-End of files
-Exit code: SUCCESS
-
-================ Step #2 =================
-
-Compiling files:
-    src/Y.kt
-    src/Z.kt
-    src/commonY.kt
-    src/commonZ.kt
-    src/useYZ.kt
-End of files
-Exit code: SUCCESS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
deleted file mode 100644
index 7fc73e5ec891..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class X {
-    fun foo(): Any
-}
-
-expect fun useX(x: X): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
deleted file mode 100644
index ef8ae049d66a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class Y {
-    fun foo(): Any
-}
-
-expect fun useY(y: Y): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
deleted file mode 100644
index 80e902ffb27d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class Z {
-    fun foo(): Any
-}
-
-expect fun useZ(z: Z): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useX.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
deleted file mode 100644
index ffb13ada9a6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useX.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun useX(x: X): Unit {
-    x.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
deleted file mode 100644
index 859c12dd85b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-actual fun useY(y: Y): Unit {
-    y.foo()
-}
-
-actual fun useZ(z: Z): Unit {
-    z.foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/X.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
deleted file mode 100644
index 2e6edf9d0000..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/X.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class X {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
deleted file mode 100644
index 8fea6dc0dfe3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class Y {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
deleted file mode 100644
index e350bdc939c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual class Z {
-    actual fun foo(): Any = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/build.log
deleted file mode 100644
index dd0d111cbc86..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-    src/X.kt
-    src/commonX.kt
-    src/useX.kt
-End of files
-Exit code: SUCCESS
-
-================ Step #2 =================
-
-Compiling files:
-    src/Y.kt
-    src/Z.kt
-    src/commonY.kt
-    src/commonZ.kt
-    src/useYZ.kt
-End of files
-Exit code: SUCCESS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
deleted file mode 100644
index 7fc73e5ec891..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class X {
-    fun foo(): Any
-}
-
-expect fun useX(x: X): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
deleted file mode 100644
index ef8ae049d66a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class Y {
-    fun foo(): Any
-}
-
-expect fun useY(y: Y): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
deleted file mode 100644
index 80e902ffb27d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class Z {
-    fun foo(): Any
-}
-
-expect fun useZ(z: Z): Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
deleted file mode 100644
index ffb13ada9a6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun useX(x: X): Unit {
-    x.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
deleted file mode 100644
index 55bd63557c96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun useX(x: String): Int =
-        x.length
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
deleted file mode 100644
index 859c12dd85b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-actual fun useY(y: Y): Unit {
-    y.foo()
-}
-
-actual fun useZ(z: Z): Unit {
-    z.foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
deleted file mode 100644
index e47e8dbdb7dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-actual class X {
-    actual fun foo(): Any = 0
-    fun bar(): Any = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
deleted file mode 100644
index 48a7a882c764..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log
+++ /dev/null
@@ -1,9 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/X.kt
-  src/commonX.kt
-  src/utilsActual.kt
-  src/utilsNoActual.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
deleted file mode 100644
index 14468f025b7e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-expect class X {
-    fun foo(): Any
-}
-
-expect fun useX(x: X): Any
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
deleted file mode 100644
index fa048f3f5763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("Utils")
-
-actual fun useX(x: X): Any = x.foo()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
deleted file mode 100644
index eda951b5556b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("Utils")
-
-actual fun useX(x: X): Any = x.foo()
-
-fun newFun() = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
deleted file mode 100644
index c58549d42e44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmMultifileClass
-@file:JvmName("Utils")
-
-fun useXBar(x: X) = x.bar()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/README.md b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/README.md
deleted file mode 100644
index 6a266264e5d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Multi module tests that run on every platform (currently JVM and JS).
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/build.log
deleted file mode 100644
index 7836e2f6683d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/build.log
+++ /dev/null
@@ -1,56 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/B.class
-  out/production/module2/use/CreateAKt.class
-  out/production/module2/use/CreateBKt.class
-  out/production/module2/use/UseAfooKt.class
-  out/production/module2/use/UseBbarKt.class
-End of files
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: foo
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/foo/A.class
-End of files
-Compiling files:
-  module2/src/A.kt
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/js-jps-build.log
deleted file mode 100644
index 3df78bc0f183..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/js-jps-build.log
+++ /dev/null
@@ -1,51 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-  out/production/module2/module2/use/use.kjsm
-End of files
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: foo
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/A.kt
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module1_A.kt
deleted file mode 100644
index 19a6b32f38d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module1_A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1
deleted file mode 100644
index 14b753925c55..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun boo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_B.kt
deleted file mode 100644
index dede900d0bd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class B : A() {
-    fun bar() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createA.kt
deleted file mode 100644
index 6821a4e06c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createA() = A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createB.kt
deleted file mode 100644
index 743cd73cb579..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createB() = B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt
deleted file mode 100644
index ebac21a6cbeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2
deleted file mode 100644
index 2896471b6444..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useAfoo.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().boo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt
deleted file mode 100644
index cad51bcbad14..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classAdded/module2_useBbar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useBbar() {
-    createB().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/build.log
deleted file mode 100644
index f062010967a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/build.log
+++ /dev/null
@@ -1,64 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/A.class
-End of files
-Building module2
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-Cleaning output files:
-  out/production/module2/foo/B.class
-  out/production/module2/use/CreateAKt.class
-  out/production/module2/use/CreateBKt.class
-  out/production/module2/use/UseAfooKt.class
-  out/production/module2/use/UseBbarKt.class
-End of files
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: boo
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/failCompilation.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting a top level declaration
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/js-jps-build.log
deleted file mode 100644
index 70c139a2e2ec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/js-jps-build.log
+++ /dev/null
@@ -1,59 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Marked as dirty by Kotlin:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-  out/production/module2/module2/use/use.kjsm
-End of files
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: boo
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/B.kt
-  module2/src/createA.kt
-  module2/src/createB.kt
-  module2/src/useAfoo.kt
-  module2/src/useBbar.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/failCompilation.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting a top level declaration
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module1_A.kt
deleted file mode 100644
index 19a6b32f38d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module1_A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun foo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt
deleted file mode 100644
index 14b753925c55..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    fun boo() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_A.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_B.kt
deleted file mode 100644
index dede900d0bd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_B.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class B : A() {
-    fun bar() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createA.kt
deleted file mode 100644
index 6821a4e06c0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createA() = A()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createB.kt
deleted file mode 100644
index 743cd73cb579..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun createB() = B()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4
deleted file mode 100644
index 5974f44fb711..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_failCompilation.kt.new.4
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO remove this file after IDEA-154390 will be fixed
-
-invalid_code
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt
deleted file mode 100644
index 2896471b6444..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().boo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2
deleted file mode 100644
index ebac21a6cbeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useAfoo.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    createA().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt
deleted file mode 100644
index cad51bcbad14..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/classRemoved/module2_useBbar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useBbar() {
-    createB().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/build.log
deleted file mode 100644
index 5c1d1a5b278d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/ConstKt.class
-End of files
-Compiling files:
-  module1/src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/Usage.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log
deleted file mode 100644
index 4a577ac7aaa3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/test/test.kjsm
-End of files
-Compiling files:
-  module1/src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt
deleted file mode 100644
index 3b7db43d11b9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-public const val CONST: String = "BF"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new
deleted file mode 100644
index 065094783710..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module1_const.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-public const val CONST: String = "Ae"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt
deleted file mode 100644
index 5275dca6468b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/constantValueChanged/module2_usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package usage
-
-@Deprecated(test.CONST + test.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log
deleted file mode 100644
index b10de0a77e1b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Compiling files:
-  module1/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-  out/production/module2/b/BKt.class
-  out/production/module2/usage/UseClassBKt.class
-  out/production/module2/usage/UseFunBKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Compiling files:
-  module1/src/failCompilation.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting a top level declaration
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log
deleted file mode 100644
index 52437a4d8b79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/js-jps-build.log
+++ /dev/null
@@ -1,39 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Compiling files:
-  module1/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Compiling files:
-  module1/src/failCompilation.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting a top level declaration
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt
deleted file mode 100644
index a3470c00a84d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1
deleted file mode 100644
index 7965b9e82a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_b.kt.new.1
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-class B
-
-fun b() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2
deleted file mode 100644
index 07014f41b99c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module1_failCompilation.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO remove this file after IDEA-154394 will be fixed
-
-invalid_code
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt
deleted file mode 100644
index 7965b9e82a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-class B
-
-fun b() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt
deleted file mode 100644
index a6e5135a4b43..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useClassA() {
-    a.A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt
deleted file mode 100644
index 568e8076a095..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useClassB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useClassB() {
-    b.B()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt
deleted file mode 100644
index 9cee04d32761..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useFunA() {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt
deleted file mode 100644
index bb4d7bca61fe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/copyFileToAnotherModule/module2_useFunB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useFunB() {
-    b.b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log
deleted file mode 100644
index eeeb3ad57877..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/build.log
+++ /dev/null
@@ -1,43 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/CreateADefaultKt.class
-  out/production/module2/foo/CreateANonDefaultKt.class
-End of files
-Compiling files:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Too many arguments for public constructor A() defined in foo.A
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/createADefault.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt
deleted file mode 100644
index ec937d3cdd96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log
deleted file mode 100644
index e2af6fd1caf3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/js-jps-build.log
+++ /dev/null
@@ -1,44 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-End of files
-Compiling files:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Too many arguments for public constructor A() defined in foo.A
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/createADefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt
deleted file mode 100644
index 532efaa3af5e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1
deleted file mode 100644
index a772984c7e9a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module1_A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt
deleted file mode 100644
index 592d4e7aea85..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(20)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/build.log
deleted file mode 100644
index 3641d3077151..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log
deleted file mode 100644
index 96900e7df432..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt
deleted file mode 100644
index 0d3a95d2ad19..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A {
-    fun foo(s: String, x: Int = 10) {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new
deleted file mode 100644
index b0f678a51759..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module1_a.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-class A {
-    fun foo(s: String, x: Int = 10, y:Int = 20) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt
deleted file mode 100644
index 4eb0fae81438..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAdded/module2_usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-import a.A
-
-fun main(args: Array<String>) {
-    A().foo("")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log
deleted file mode 100644
index 341318a6b847..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log
deleted file mode 100644
index 96900e7df432..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt
deleted file mode 100644
index 642e76de3761..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun foo(s: String, x: Int = 10) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new
deleted file mode 100644
index d496f7777f70..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module1_a.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun foo(s: String, x: Int = 10, y:Int = 20) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt
deleted file mode 100644
index c739a83b15e6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun/module2_usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    a.foo("")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/build.log
deleted file mode 100644
index 3641d3077151..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log
deleted file mode 100644
index 96900e7df432..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt
deleted file mode 100644
index 1d9021525679..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A {
-    fun foo(x:Int = 10) {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new
deleted file mode 100644
index ecefb7d1c191..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A {
-    fun foo() {
-    }
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt
deleted file mode 100644
index 7c3eb527bdc0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemoved/module2_usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-fun b(param: a.A) {
-    param.foo()
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log
deleted file mode 100644
index 341318a6b847..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log
deleted file mode 100644
index 96900e7df432..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt
deleted file mode 100644
index 6678dd7608c5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun foo(x: Int = 10) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new
deleted file mode 100644
index ae5ee652ccc0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module1_a.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun foo() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt
deleted file mode 100644
index 5c991459597a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun/module2_usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    a.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log
deleted file mode 100644
index 73dd59fe253d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/build.log
+++ /dev/null
@@ -1,43 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/CreateADefaultKt.class
-  out/production/module2/foo/CreateANonDefaultKt.class
-End of files
-Compiling files:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-No value passed for parameter 'x'
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/createANonDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt
deleted file mode 100644
index ec937d3cdd96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log
deleted file mode 100644
index e2fa2d0c6578..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/js-jps-build.log
+++ /dev/null
@@ -1,44 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-End of files
-Compiling files:
-  module2/src/createADefault.kt
-  module2/src/createANonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-No value passed for parameter 'x'
-
-================ Step #2 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/createANonDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt
deleted file mode 100644
index 532efaa3af5e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1
deleted file mode 100644
index af03c523fef8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module1_A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A(x: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createADefault.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt
deleted file mode 100644
index 592d4e7aea85..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/defaultValueInConstructorRemoved/module2_createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(20)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/build.log
deleted file mode 100644
index 917d81caa03a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/build.log
+++ /dev/null
@@ -1,17 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/UseAKt.class
-  out/production/module2/UseUtilsKt.class
-End of files
-Compiling files:
-  module2/src/useA.kt
-  module2/src/useUtils.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log
deleted file mode 100644
index cee3a3fce961..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/js-jps-build.log
+++ /dev/null
@@ -1,17 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/root-package.kjsm
-End of files
-Compiling files:
-  module2/src/useA.kt
-  module2/src/useUtils.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt
deleted file mode 100644
index 2f1a23c74ebd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-    fun fizz() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt
deleted file mode 100644
index 76612dffc16b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_other1.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun other1() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt
deleted file mode 100644
index 60843f060c10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module1_utils.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun fizz() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt
deleted file mode 100644
index dd957f79c672..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
-    fun buzz() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt
deleted file mode 100644
index e7b29d7ffe4e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_other2.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun other2() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt
deleted file mode 100644
index d662c17f0776..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    A().buzz()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useA.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt
deleted file mode 100644
index 11202c9b2f6b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useUtils() {
-    buzz()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_useUtils.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt
deleted file mode 100644
index ed02bf9e14f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/duplicatedClass/module2_utils.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun buzz() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/build.log
deleted file mode 100644
index 6f49ab1fbd3c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/build.log
+++ /dev/null
@@ -1,78 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-  module4/src/importAGrandChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-  module4/src/importAGrandChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/foo/AGrandChild.class
-End of files
-Compiling files:
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-End of files
-Compiling files:
-  module4/src/importAGrandChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/dependencies.txt
deleted file mode 100644
index 7a6efaafbb9d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/dependencies.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module1->
-module2->module1[exported]
-module3->module2
-module4->module3
-module4->module2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/gradle-build.log
deleted file mode 100644
index a5954d01354a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/gradle-build.log
+++ /dev/null
@@ -1,52 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private' supertype A
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log
deleted file mode 100644
index 8bdfe131699a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/js-jps-build.log
+++ /dev/null
@@ -1,83 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-  module4/src/importAGrandChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-End of files
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-  module4/src/importAGrandChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/module3.js
-  out/production/module3/module3.meta.js
-  out/production/module3/module3/foo/foo.kjsm
-End of files
-Compiling files:
-  module3/src/AGrandChild.kt
-  module3/src/importAGrandChild.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/module4.js
-  out/production/module4/module4.meta.js
-End of files
-Compiling files:
-  module4/src/importAGrandChild.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/klib-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/klib-build.log
deleted file mode 100644
index a5954d01354a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/klib-build.log
+++ /dev/null
@@ -1,52 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private' supertype A
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1
deleted file mode 100644
index dace6cffce46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-private open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module1_A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module2_AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt
deleted file mode 100644
index c2b0af75dbae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_AGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AGrandChild : AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module3_importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt
deleted file mode 100644
index 4505ddef000f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/exportedDependency/module4_importAGrandChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AGrandChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log
deleted file mode 100644
index 676df623651a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/module1/FooKt.class
-End of files
-Compiling files:
-  module1/src/foo.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/useFoo.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/module2/UseFooKt.class
-End of files
-Compiling files:
-  module2/src/useFoo.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log
deleted file mode 100644
index af9ede2d99b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/module1/module1.kjsm
-End of files
-Compiling files:
-  module1/src/foo.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/useFoo.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/module2/module2.kjsm
-End of files
-Compiling files:
-  module2/src/useFoo.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt
deleted file mode 100644
index 26ea6e9d58af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module1
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt
deleted file mode 100644
index 9c6131fe8fb5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module1
-
-fun foo(): Int = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new
deleted file mode 100644
index f1f757a169f6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module1_foo.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package module1
-
-fun foo(): String = "0"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt
deleted file mode 100644
index 69525319a1b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package module2
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt
deleted file mode 100644
index b1d079fc39ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/functionFromDifferentPackageChanged/module2_useFoo.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package module2
-
-import module1.foo
-
-fun useFoo() = foo()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/build.log
deleted file mode 100644
index 55bc9b6f591b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineKt.class
-End of files
-Compiling files:
-  module1/src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log
deleted file mode 100644
index d8abf06e1d2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/inline/inline.kjsm
-End of files
-Compiling files:
-  module1/src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log
deleted file mode 100644
index 06fe308234dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineKt.class
-End of files
-Compiling files:
-  module1/src/inline.kt
-End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt
deleted file mode 100644
index 80d71e901a35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new
deleted file mode 100644
index 87422d45d884..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_inline.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    body()
-    println("i'm inline function")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt
deleted file mode 100644
index 4af04d89ad79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module1_other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package inline
-
-fun other() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt
deleted file mode 100644
index 8e3cf423a25a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionInlined/module2_usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-inline fun inlineUsage(body: () -> Unit) {
-    inline.f { println("to be inlined") }
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log
deleted file mode 100644
index ef3b395e24c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/build.log
+++ /dev/null
@@ -1,53 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineFKt.class
-End of files
-Compiling files:
-  module1/src/inlineF.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usageF.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageFKt.class
-End of files
-Compiling files:
-  module2/src/usageF.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineGKt.class
-End of files
-Compiling files:
-  module1/src/inlineG.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usageG.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageGKt.class
-End of files
-Compiling files:
-  module2/src/usageG.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log
deleted file mode 100644
index b847314a1f30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/js-jps-build.log
+++ /dev/null
@@ -1,57 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/inline/inline.kjsm
-End of files
-Compiling files:
-  module1/src/inlineF.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usageF.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usageF.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/inline/inline.kjsm
-End of files
-Compiling files:
-  module1/src/inlineG.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/usageG.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/usageG.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log
deleted file mode 100644
index 05389d4d132b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log
+++ /dev/null
@@ -1,47 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineFKt.class
-End of files
-Compiling files:
-  module1/src/inlineF.kt
-End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageFKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/inline/InlineGKt.class
-End of files
-Compiling files:
-  module1/src/inlineG.kt
-End of files
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/usage/UsageGKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt
deleted file mode 100644
index 80d71e901a35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1
deleted file mode 100644
index 87422d45d884..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    body()
-    println("i'm inline function")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt
deleted file mode 100644
index ba93f50fb4f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun g(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2
deleted file mode 100644
index 1aa58fd92fda..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun g(body: () -> Unit) {
-    body()
-    println("i'm inline function")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt
deleted file mode 100644
index 4af04d89ad79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module1_other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package inline
-
-fun other() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt
deleted file mode 100644
index f8c6a2b97217..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_other.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    useF()
-    useG()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt
deleted file mode 100644
index a8b25a5582c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageF.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useF() {
-    inline.f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt
deleted file mode 100644
index 3ea53b7ef59d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/module2_usageG.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useG() {
-    inline.g { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log
deleted file mode 100644
index 45d7dfb89cef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/build.log
+++ /dev/null
@@ -1,31 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Compiling files:
-  module1/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-  out/production/module2/b/BKt.class
-End of files
-Building module2
-Marked as dirty by Kotlin:
-  module2/src/useClassB.kt
-Cleaning output files:
-  out/production/module2/usage/UseClassBKt.class
-  out/production/module2/usage/UseFunBKt.class
-End of files
-Compiling files:
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log
deleted file mode 100644
index f9e2f1d4b992..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Compiling files:
-  module1/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Marked as dirty by Kotlin:
-  module2/src/useClassB.kt
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-  out/production/module2/module2/usage/usage.kjsm
-End of files
-Compiling files:
-  module2/src/useClassB.kt
-  module2/src/useFunB.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt
deleted file mode 100644
index a3470c00a84d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new
deleted file mode 100644
index 7965b9e82a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module1_b.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-class B
-
-fun b() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt
deleted file mode 100644
index 7965b9e82a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-class B
-
-fun b() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_b.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt
deleted file mode 100644
index a6e5135a4b43..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useClassA() {
-    a.A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt
deleted file mode 100644
index 568e8076a095..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useClassB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useClassB() {
-    b.B()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt
deleted file mode 100644
index 9cee04d32761..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useFunA() {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt
deleted file mode 100644
index bb4d7bca61fe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/moveFileToAnotherModule/module2_useFunB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useFunB() {
-    b.b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/build.log
deleted file mode 100644
index fe9147abedf1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/build.log
+++ /dev/null
@@ -1,68 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-Cannot access 'A': it is private in file
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-End of files
-Compiling files:
-  module3/src/importAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/dependencies.txt
deleted file mode 100644
index 23443cb3657b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module1->
-module2->module1
-module3->module2
-module3->module1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/gradle-build.log
deleted file mode 100644
index 199d0044d5e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/gradle-build.log
+++ /dev/null
@@ -1,67 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private' supertype A
-Cannot access 'A': it is private in file
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/js-jps-build.log
deleted file mode 100644
index 0fbb2d98f962..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/js-jps-build.log
+++ /dev/null
@@ -1,72 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/foo/foo.kjsm
-End of files
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private-in-file' supertype A
-Cannot access 'A': it is private in file
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/foo/foo.kjsm
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/module3.js
-  out/production/module3/module3.meta.js
-End of files
-Compiling files:
-  module3/src/importAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/klib-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/klib-build.log
deleted file mode 100644
index 199d0044d5e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/klib-build.log
+++ /dev/null
@@ -1,67 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/AChild.class
-End of files
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'A': it is private in file
-'public' subclass exposes its 'private' supertype A
-Cannot access 'A': it is private in file
-
-================ Step #2 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-  module3/src/importAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Compiling files:
-  module2/src/AChild.kt
-  module2/src/importA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.1
deleted file mode 100644
index dace6cffce46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-private open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.2
deleted file mode 100644
index 92b9a921ee98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module1_A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-open class A {
-    open fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_AChild.kt
deleted file mode 100644
index 36bab590318d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_importA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_importA.kt
deleted file mode 100644
index 0e3a07f72265..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module2_importA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module3_importAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module3_importAChild.kt
deleted file mode 100644
index aef89fb30589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simple/module3_importAChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-import foo.AChild
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/build.log
deleted file mode 100644
index 6ddaba7c84bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/build.log
+++ /dev/null
@@ -1,27 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log
deleted file mode 100644
index 2301a169d23d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/js-jps-build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt
deleted file mode 100644
index a3470c00a84d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new
deleted file mode 100644
index 38e7ea70acfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A
-
-fun a(): String {
-    return ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_b.kt
deleted file mode 100644
index 5c19b61add76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package b
-
-fun b(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_c.kt
deleted file mode 100644
index c4fab8fb00b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependency/module2_c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun c() {
-    // This file doesn't use anything from module1, so it won't be recompiled after change
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log
deleted file mode 100644
index 21e1a5725412..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/build.log
+++ /dev/null
@@ -1,39 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-  out/production/module1/a/ClassAnnotation.class
-  out/production/module1/a/FileAnnotation.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'ClassAnnotation': it is internal in 'a'
-Cannot access 'ClassAnnotation': it is internal in 'a'
-'public' function exposes its 'internal' parameter type A
-Cannot access 'A': it is internal in 'a'
-Cannot access 'a': it is internal in 'a'
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log
deleted file mode 100644
index 654c739152c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/js-jps-build.log
+++ /dev/null
@@ -1,37 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'A': it is internal in 'a'
-Cannot access 'FileAnnotation': it is internal in 'a'
-Cannot access 'ClassAnnotation': it is internal in 'a'
-Cannot access 'ClassAnnotation': it is internal in 'a'
-'public' function exposes its 'internal' parameter type A
-Cannot access 'A': it is internal in 'a'
-Cannot access 'a': it is internal in 'a'
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
deleted file mode 100644
index 621ede2ee51b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package a
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-annotation class FileAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class ClassAnnotation()
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
deleted file mode 100644
index e514959008ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new
+++ /dev/null
@@ -1,15 +0,0 @@
-package a
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class FileAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class ClassAnnotation()
-
-internal class A
-
-internal fun a(): String {
-    return ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
deleted file mode 100644
index 9573f5d05178..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_b.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:FileAnnotation
-package b
-
-import a.A
-import a.FileAnnotation
-import a.ClassAnnotation
-
-@ClassAnnotation
-class B
-
-fun b(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
deleted file mode 100644
index c4fab8fb00b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1/module2_c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun c() {
-    // This file doesn't use anything from module1, so it won't be recompiled after change
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log
deleted file mode 100644
index c2879e00c748..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-  out/production/module1/a/InternalA.class
-  out/production/module1/a/InternalClassAnnotation.class
-  out/production/module1/a/InternalFileAnnotation.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'InternalFileAnnotation': it is internal in 'a'
-Cannot access 'InternalFileAnnotation': it is internal in 'a'
-Cannot access 'InternalClassAnnotation': it is internal in 'a'
-Cannot access 'InternalClassAnnotation': it is internal in 'a'
-Unresolved reference: InternalA
-Unresolved reference: internalA
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log
deleted file mode 100644
index 52ab460ecb72..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/js-jps-build.log
+++ /dev/null
@@ -1,33 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'InternalFileAnnotation': it is internal in 'a'
-Cannot access 'InternalFileAnnotation': it is internal in 'a'
-Cannot access 'InternalClassAnnotation': it is internal in 'a'
-Cannot access 'InternalClassAnnotation': it is internal in 'a'
-Unresolved reference: InternalA
-Unresolved reference: internalA
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
deleted file mode 100644
index e7392045a0bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package a
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation()
-
-class A
-
-internal class InternalA
-
-fun a() {
-}
-
-internal fun internalA() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
deleted file mode 100644
index bc6968647506..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new
+++ /dev/null
@@ -1,19 +0,0 @@
-package a
-
-@Target(AnnotationTarget.FILE)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalFileAnnotation()
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class InternalClassAnnotation()
-
-class A
-
-internal class AA
-
-fun a() {
-}
-
-internal fun aa() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
deleted file mode 100644
index 436721358e97..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package b
-
-class B
-
-fun b(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
deleted file mode 100644
index 961d6541b9c5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new
+++ /dev/null
@@ -1,12 +0,0 @@
-@file:InternalFileAnnotation
-package b
-
-import a.InternalFileAnnotation
-import a.InternalClassAnnotation
-
-@InternalClassAnnotation
-class B
-
-fun b(param: a.InternalA) {
-    a.internalA()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
deleted file mode 100644
index c4fab8fb00b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2/module2_c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun c() {
-    // This file doesn't use anything from module1, so it won't be recompiled after change
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log
deleted file mode 100644
index 5e8c72703853..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/build.log
+++ /dev/null
@@ -1,16 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt
deleted file mode 100644
index 827bf04cc589..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log
deleted file mode 100644
index 6468530f4e62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/js-jps-build.log
+++ /dev/null
@@ -1,16 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt
deleted file mode 100644
index 3f615e23d4ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A
-
-fun a() {
-    println("I'm an old body")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new
deleted file mode 100644
index 8579ae24e379..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A
-
-fun a() {
-    println("I'm a new body")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt
deleted file mode 100644
index 5c19b61add76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/simpleDependencyUnchanged/module2_b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package b
-
-fun b(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/build.log
deleted file mode 100644
index 4efd21570b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/build.log
+++ /dev/null
@@ -1,30 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt
deleted file mode 100644
index 0341c1ffd5c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module2
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log
deleted file mode 100644
index 13f114657c2c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/js-jps-build.log
+++ /dev/null
@@ -1,31 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module3
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt
deleted file mode 100644
index a3470c00a84d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new
deleted file mode 100644
index 38e7ea70acfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A
-
-fun a(): String {
-    return ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt
deleted file mode 100644
index 64f75565c38b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module2_b.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package b
-
-fun b(param: a.A) {
-    a.a()
-}
-
-fun bb() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt
deleted file mode 100644
index e45bff75ab8a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveDependency/module3_c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun c() {
-    b.bb()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/build.log
deleted file mode 100644
index a164a0fe736a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module3/src/c.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt
deleted file mode 100644
index 0341c1ffd5c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module2
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log
deleted file mode 100644
index e3aee077e219..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/js-jps-build.log
+++ /dev/null
@@ -1,43 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module3/src/c.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/module3.js
-  out/production/module3/module3.meta.js
-  out/production/module3/module3/c/c.kjsm
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/klib-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/klib-build.log
deleted file mode 100644
index a61128f2c4c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/klib-build.log
+++ /dev/null
@@ -1,6 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt
deleted file mode 100644
index cbd343133d9a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-inline fun a(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new
deleted file mode 100644
index 7b25135b533e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_a.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-inline fun a(body: () -> Unit) {
-    println("i am inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt
deleted file mode 100644
index 7e2bad9ae9ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module1_other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package a
-
-fun other() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt
deleted file mode 100644
index 00b43177b186..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module2_b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-inline fun b(body: () -> Unit) {
-    a.a { println("to be inlined into b") }
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt
deleted file mode 100644
index 799cfd1e836e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/transitiveInlining/module3_c.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package c
-
-inline fun c(body: () -> Unit) {
-    b.b { println("to be inlined into b") }
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/build.log
deleted file mode 100644
index e15db13f4064..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/build.log
+++ /dev/null
@@ -1,38 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-  module3/src/c.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/c/CKt.class
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/dependencies.txt
deleted file mode 100644
index 1365e57e1355..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/dependencies.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module1->
-module2->module1
-module3->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/js-jps-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/js-jps-build.log
deleted file mode 100644
index 89c5bf41776a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/js-jps-build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Building module1
-Cleaning output files:
-  out/production/module1/module1.js
-  out/production/module1/module1.meta.js
-  out/production/module1/module1/a/a.kjsm
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  module2/src/b.kt
-  module3/src/c.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module3
-Cleaning output files:
-  out/production/module3/module3.js
-  out/production/module3/module3.meta.js
-  out/production/module3/module3/c/c.kjsm
-End of files
-Compiling files:
-  module3/src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module2
-Cleaning output files:
-  out/production/module2/module2.js
-  out/production/module2/module2.meta.js
-  out/production/module2/module2/b/b.kjsm
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt
deleted file mode 100644
index a3470c00a84d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class A
-
-fun a() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new
deleted file mode 100644
index 38e7ea70acfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module1_a.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package a
-
-class A
-
-fun a(): String {
-    return ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module2_b.kt
deleted file mode 100644
index 5c19b61add76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module2_b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package b
-
-fun b(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module3_c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module3_c.kt
deleted file mode 100644
index 68a8f9a70f04..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/common/twoDependants/module3_c.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun c(param: a.A) {
-    a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/build.log
deleted file mode 100644
index 21745068b956..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/build.log
+++ /dev/null
@@ -1,83 +0,0 @@
-================ Step #1 =================
-
-Building module1, module2, module3
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  module1/src/D.kt
-  module2/src/B.kt
-  module3/src/C.kt
-  module4/src/E.kt
-  module5/src/F.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/foo/D.class
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/foo/B.class
-  out/production/module3/META-INF/module3.kotlin_module
-  out/production/module3/foo/C.class
-End of files
-Compiling files:
-  module1/src/D.kt
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Compiling files:
-  module3/src/C.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-This type is final, so it cannot be inherited from
-
-================ Step #2 =================
-
-Building module1, module2, module3
-Cleaning output files:
-  out/production/module1/foo/A.class
-End of files
-Compiling files:
-  module1/src/A.kt
-  module1/src/D.kt
-End of files
-Compiling files:
-  module2/src/B.kt
-End of files
-Compiling files:
-  module3/src/C.kt
-End of files
-Marked as dirty by Kotlin:
-  module4/src/E.kt
-  module5/src/F.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building module4
-Cleaning output files:
-  out/production/module4/META-INF/module4.kotlin_module
-  out/production/module4/foo/E.class
-End of files
-Compiling files:
-  module4/src/E.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module5
-Cleaning output files:
-  out/production/module5/META-INF/module5.kotlin_module
-  out/production/module5/foo/F.class
-End of files
-Compiling files:
-  module5/src/F.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/dependencies.txt
deleted file mode 100644
index 4135ff7c2892..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/dependencies.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module1->module3
-module2->module1[exported]
-module3->module2[exported]
-module4->module2
-module5->module3
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1
deleted file mode 100644
index 16d999e4a49b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2
deleted file mode 100644
index 6d80703e7b40..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_A.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_D.kt
deleted file mode 100644
index 221afec46445..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module1_D.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class D : C()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module2_B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module2_B.kt
deleted file mode 100644
index cf9f6d41c337..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module2_B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module3_C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module3_C.kt
deleted file mode 100644
index cf93d3da7907..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module3_C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module4_E.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module4_E.kt
deleted file mode 100644
index 3e9a3199d859..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module4_E.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class E : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module5_F.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module5_F.kt
deleted file mode 100644
index e32d45f0ea6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circular/module5_F.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class F : C()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log
deleted file mode 100644
index c779a39139bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Building module1, module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/B.class
-  out/production/module2/b/BB.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  module1/src/a.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/A.class
-  out/production/module1/a/AA.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt
deleted file mode 100644
index 02d5c8ca1a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->module2
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt
deleted file mode 100644
index 653e6a5b31f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module1_a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-open class A
-
-class AA: b.BB()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt
deleted file mode 100644
index 1cc0414c989f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package b
-
-class B: a.A() {
-}
-
-open class BB {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new
deleted file mode 100644
index dd98580a43e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyClasses/module2_b.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-package b
-
-class B: a.A() {
-   fun f() {
-   }
-}
-
-open class BB {
-   fun f() {
-   }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log
deleted file mode 100644
index f72749d18b0e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Building module1, module2
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/test/AKt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt
deleted file mode 100644
index 02d5c8ca1a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->module2
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt
deleted file mode 100644
index 8311da660123..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-fun a() {
-
-}
-
-val a = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module1_a.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt
deleted file mode 100644
index b04c387135d0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged/module2_b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-fun b() {
-
-}
-
-var b = b()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log
deleted file mode 100644
index e198f99e0346..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Building module1, module2
-Cleaning output files:
-  out/production/module2/META-INF/module2.kotlin_module
-  out/production/module2/b/BKt.class
-End of files
-Compiling files:
-  module2/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt
deleted file mode 100644
index 02d5c8ca1a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->module2
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt
deleted file mode 100644
index 5f77590e6247..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module1_a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package a
-
-class A
-
-fun a() {
-    // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source
-    // Must be uncommented when modules are supported in compiler
-    //b.b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt
deleted file mode 100644
index 164222697b7f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package b
-
-fun b() {
-    // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source
-    // Must be uncommented when modules are supported in compiler
-    // a.a()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new
deleted file mode 100644
index b6a3f3fd029f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions/module2_b.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-package b
-
-fun b() {
-    // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source
-    // Must be uncommented when modules are supported in compiler
-    // a.a()
-}
-
-fun bb() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log
deleted file mode 100644
index 29e6af99f89a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Building module1, module2
-Cleaning output files:
-  out/production/module1/META-INF/module1.kotlin_module
-  out/production/module1/a/AKt.class
-  out/production/module1/c/C2Kt.class
-End of files
-Compiling files:
-  module1/src/a.kt
-  module1/src/c2.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt
deleted file mode 100644
index 02d5c8ca1a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/dependencies.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module1->module2
-module2->module1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt
deleted file mode 100644
index 82c0d8b13db2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun a() {
-    c.internalFun()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new
deleted file mode 100644
index 93d22c828dd9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_a.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package a
-
-fun a() {
-}
-
-fun aa() {
-    c.internalFun()
-    c.internalFun2()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt
deleted file mode 100644
index 46450e9f3520..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-fun publicFun() {}
-
-internal fun internalFun2() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt
deleted file mode 100644
index 8bf543305e81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package c
-
-internal fun internalFun() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new
deleted file mode 100644
index 4eac7a9f212e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module1_c2.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package c
-
-internal fun internalFun() {}
-
-fun newFun() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt
deleted file mode 100644
index 7965b9e82a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal/module2_b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package b
-
-class B
-
-fun b() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/README.md b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/README.md
deleted file mode 100644
index 2a166574ab93..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Multiplatform multi module tests with custom content.
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt
deleted file mode 100644
index cc3166eab6f5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_dependencies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-c [sourceSetHolder]
-
-pJvm [compilationAndSourceSetHolder, jvm]
-pJvm -> c [include]
-
-pJs [compilationAndSourceSetHolder, js]
-pJs -> c [include]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt
deleted file mode 100644
index 741783782ad0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/_steps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-make compilation fail
-fix error
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/build.log
deleted file mode 100644
index 1d964d325cf2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/build.log
+++ /dev/null
@@ -1,42 +0,0 @@
-================ Step #1 make compilation fail =================
-
-Building c
-Building pJs
-Cleaning output files:
-  out/production/pJs/pJs.js
-  out/production/pJs/pJs.meta.js
-  out/production/pJs/pJs/root-package.kjsm
-End of files
-Compiling files:
-  c/src/f.kt
-  pJs/src/fJs.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[pJs] Expecting a top level declaration
-[pJs] Expecting a top level declaration
-
-================ Step #2 fix error =================
-
-Building c
-Building pJs
-Compiling files:
-  c/src/f.kt
-  pJs/src/fJs.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-End of files
-Cleaning output files:
-  out/production/pJvm/FJvmKt.class
-End of files
-Compiling files:
-  c/src/f.kt
-  pJvm/src/fJvm.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt
deleted file mode 100644
index ada5b178eadf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt
+++ /dev/null
@@ -1 +0,0 @@
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1
deleted file mode 100644
index cfc808ee20b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-:(
-
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2
deleted file mode 100644
index ada5b178eadf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/c_f.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt
deleted file mode 100644
index dd3ad76e04ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJs_fJs.kt
+++ /dev/null
@@ -1 +0,0 @@
-actual fun f() = Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt
deleted file mode 100644
index dd3ad76e04ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError/pJvm_fJvm.kt
+++ /dev/null
@@ -1 +0,0 @@
-actual fun f() = Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt
deleted file mode 100644
index cc3166eab6f5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_dependencies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-c [sourceSetHolder]
-
-pJvm [compilationAndSourceSetHolder, jvm]
-pJvm -> c [include]
-
-pJs [compilationAndSourceSetHolder, js]
-pJs -> c [include]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt
deleted file mode 100644
index 741783782ad0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/_steps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-make compilation fail
-fix error
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log
deleted file mode 100644
index fe264db97e0e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log
+++ /dev/null
@@ -1,47 +0,0 @@
-================ Step #1 make compilation fail =================
-
-Building c
-Building pJs
-Cleaning output files:
-  out/production/pJs/pJs.js
-  out/production/pJs/pJs.meta.js
-  out/production/pJs/pJs/root-package.kjsm
-End of files
-Compiling files:
-  c/src/f.kt
-  c/src/g.kt
-  pJs/src/fg.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[pJs] Expecting a top level declaration
-[pJs] Expecting a top level declaration
-
-================ Step #2 fix error =================
-
-Building c
-Building pJs
-Compiling files:
-  c/src/f.kt
-  c/src/g.kt
-  pJs/src/fg.kt
-End of files
-Exit code: OK
-------------------------------------------
-Marked as dirty by Kotlin:
-  c/src/g.kt
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-End of files
-Cleaning output files:
-  out/production/pJvm/FgKt.class
-End of files
-Compiling files:
-  c/src/f.kt
-  c/src/g.kt
-  pJvm/src/fg.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt
deleted file mode 100644
index ada5b178eadf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt
+++ /dev/null
@@ -1 +0,0 @@
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1
deleted file mode 100644
index cfc808ee20b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-:(
-
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2
deleted file mode 100644
index ada5b178eadf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_f.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-expect fun f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt
deleted file mode 100644
index fb1d4fe60f26..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/c_g.kt
+++ /dev/null
@@ -1 +0,0 @@
-expect fun g()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt
deleted file mode 100644
index 84de5cf9d17c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJs_fg.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun f() = Unit
-
-actual fun g() = Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt
deleted file mode 100644
index 84de5cf9d17c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/pJvm_fg.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun f() = Unit
-
-actual fun g() = Unit
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt
deleted file mode 100644
index cc3166eab6f5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-c [sourceSetHolder]
-
-pJvm [compilationAndSourceSetHolder, jvm]
-pJvm -> c [include]
-
-pJs [compilationAndSourceSetHolder, js]
-pJs -> c [include]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt
deleted file mode 100644
index bec742d23bc4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-use @Optional in JS
-remove @Optional from JS
-use @Optional in JVM
-remove @Optional from JVM
-add another @Optional in Common module
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log
deleted file mode 100644
index 86ce0e9baeba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log
+++ /dev/null
@@ -1,62 +0,0 @@
-================ Step #1 use @Optional in JS =================
-
-Building c
-Building pJs
-Compiling files:
-  pJs/src/c.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Declaration annotated with '@OptionalExpectation' can only be used in common module sources
-
-================ Step #2 remove @Optional from JS =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 use @Optional in JVM =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Compiling files:
-  pJvm/src/c.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Declaration annotated with '@OptionalExpectation' can only be used in common module sources
-
-================ Step #4 remove @Optional from JVM =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #5 add another @Optional in Common module =================
-
-Building c
-Building pJs
-Compiling files:
-  c/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building pJvm
-Compiling files:
-  c/src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt
deleted file mode 100644
index ec60fb9db217..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_a.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-@file:OptIn(kotlin.ExperimentalMultiplatform::class)
-
-@OptionalExpectation
-expect annotation class Optional(val value: String)
-
-@Optional("Foo")
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5
deleted file mode 100644
index e25c8d330eee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/c_b.kt.new.5
+++ /dev/null
@@ -1,2 +0,0 @@
-@Optional("Foo")
-class Bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1
deleted file mode 100644
index 6b3d50be104e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-// Should be an error: Declaration annotated with '@OptionalExpectation' can only be used in common module sources
-@Optional("BarJs")
-class BarJs
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.delete.4
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3
deleted file mode 100644
index 55acce24e4e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJvm_c.kt.new.3
+++ /dev/null
@@ -1,3 +0,0 @@
-// Should be an error: Declaration annotated with '@OptionalExpectation' can only be used in common module sources
-@Optional("BarJvm")
-class BarJvm
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt
deleted file mode 100644
index 4d7c19bc98d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/_dependencies.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-c [sourceSetHolder]
-
-pJvm [compilationAndSourceSetHolder, jvm]
-pJvm -> c [include]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
deleted file mode 100644
index 2705cae024d9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log
+++ /dev/null
@@ -1,17 +0,0 @@
-================ Step #1 =================
-
-Building c
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/FJvmKt.class
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-End of files
-Cleaning output files:
-  out/production/pJvm/FKt.class
-End of files
-Compiling files:
-  c/src/f.kt
-  pJvm/src/fJvm.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
deleted file mode 100644
index 8cd923f49e22..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/c_f.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-expect fun f()
-
-@ExperimentalMultiplatform
-@OptionalExpectation
-internal expect annotation class SharedImmutable()
-
-@ExperimentalMultiplatform
-@SharedImmutable
-val UNDEFINED = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt
deleted file mode 100644
index 28071449f086..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun f() = Unit
-
-fun x() = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1
deleted file mode 100644
index 882aadc875cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/pJvm_fJvm.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-actual fun f() = Unit
-
-fun x() = 2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt
deleted file mode 100644
index 94161f8d01d7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-c [sourceSetHolder]
-
-pJvm [compilationAndSourceSetHolder, jvm]
-pJvm -> c [include]
-
-pJs [compilationAndSourceSetHolder, js]
-pJs -> c [include]
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log
deleted file mode 100644
index 85eb646b8c3c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Building c
-Building pJs
-Cleaning output files:
-  out/production/pJs/pJs.js
-  out/production/pJs/pJs.meta.js
-  out/production/pJs/pJs/root-package.kjsm
-End of files
-Compiling files:
-  c/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/Usage.class
-End of files
-Compiling files:
-  c/src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt
deleted file mode 100644
index 84c59ee8284e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-@OptIn(ExperimentalMultiplatform::class)
-@OptionalExpectation
-expect annotation class Optional(val value: String)
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt
deleted file mode 100644
index a76180ac767d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-@Optional("1")
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1
deleted file mode 100644
index 834e6ff534df..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1
+++ /dev/null
@@ -1,2 +0,0 @@
-@Optional("2")
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt
deleted file mode 100644
index c359f356aad0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/_dependencies.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-pJvm [jvm]
-pJs [js]
-
-pJs -> pJvm [compile]
-pJvm -> pJs [compile]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log
deleted file mode 100644
index 5091f14c399f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/init-build.log
+++ /dev/null
@@ -1,5 +0,0 @@
-Building pJs, pJvm
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cyclically dependent modules pJvm (jvm), pJs (js) should have same compiler.
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt
deleted file mode 100644
index 38aa24d047b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJs_f.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun f() = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt
deleted file mode 100644
index acbed98f796a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/pJvm_g.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun g() = 2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md
deleted file mode 100644
index fb647617797d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Multiplatform multi module tests with generated content.
-
-This tests is autogenerated based on dependencies.txt by `MppJpsIncTestsGenerator`.
-
-This things are generated:
-  - For each module content will be generated based on module type:
-     - `common`
-     - `jvm`
-     - `js`
-  - Modules can be marked with `edit`, `editJvm` and `editExpectActual`. For this modules, modification steps will be generated. For each module and each flag subdirectory will be created and empty `build.log` will be putted (if it wasn't already). This directory will be used to generate `MultiplatformJpsTestGenerated`.
-     - `edit`, `editJvm`:
-        - new services will be created 
-        - service will be changed
-        - service will be deleted
-     - `editExpectActual`
-        - new services will be created in common module
-        - service will be created on each platform module as separate step (to test common files state tracking separately for each platform module)
-        - service will be changed on each platform module as separate step
-        - service will be deleted
-
-Module contents will be generated at run time in the temporary directory. To see it contents please set breakpoint at `TODO`. To simplify mega-multi-modules tests debugging, all modules are sorted in topological order and prefixed with index. Example of generated project:
-```
-00_raJvmClient_RaJvmClientJavaClass.java
-00_raJvmClient_serviceRaJvmClientImpl.kt
-01_raJvmServer_RaJvmServerJavaClass.java
-01_raJvmServer_serviceRaJvmServerImpl.kt
-02_raJsClient_serviceRaJsClientImpl.kt
-03_raJsServer_serviceRaJsServerImpl.kt
-04_rbJvmClient_RbJvmClientJavaClass.java
-04_rbJvmClient_serviceRbJvmClientImpl.kt
-...
-```
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt
deleted file mode 100644
index a2e14868be2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/dependencies.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO: editExpectActual
-c [common, edit]
-
-pJvm [jvm, edit, editJvm]
-pJvm -> c [expectedBy]
-
-pJs [js, edit]
-pJs -> c [expectedBy]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log
deleted file mode 100644
index 2205b574ff8a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava/build.log
+++ /dev/null
@@ -1,65 +0,0 @@
-================ Step #1 create new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  pJvm/src/PJvmNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/PJvmNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  pJvm/src/PJvmNewJavaClass.java
-End of files
-
-================ Step #3 delete new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/pJvm/PJvmNewJavaClass.class
-End of files
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Building pJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log
deleted file mode 100644
index 3fd5c7da611a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin/build.log
+++ /dev/null
@@ -1,51 +0,0 @@
-================ Step #1 create new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building c
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Building pJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt
deleted file mode 100644
index f099db2bff50..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/dependencies.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-MUTED
-
-cMain [common, editExpectActual]
-
-cTests [common, editExpectActual]
-cTests -> cMain [compile]
-
-// jvm
-pJvmMain [jvm]
-pJvmMain -> cMain [expectedBy]
-
-pJvmTests [jvm]
-pJvmTests -> pJvmMain [compile]
-pJvmTests -> cTests [expectedBy]
-
-// js
-pJsMain [js]
-pJsMain -> cMain [expectedBy]
-
-pJsTests [js]
-pJsTests -> pJsMain [compile]
-pJsTests -> cTests [expectedBy]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual/build.log
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual/build.log
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt
deleted file mode 100644
index f0b4bf26f09d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/dependencies.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO: editExpectActual
-c [sourceSetHolder, edit]
-
-pJvm [compilationAndSourceSetHolder, jvm, edit, editJvm]
-pJvm -> c [include]
-
-pJs [compilationAndSourceSetHolder, js, edit]
-pJs -> c [include]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log
deleted file mode 100644
index 645746606b89..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava/build.log
+++ /dev/null
@@ -1,59 +0,0 @@
-================ Step #1 create new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  pJvm/src/PJvmNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/PJvmNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  pJvm/src/PJvmNewJavaClass.java
-End of files
-
-================ Step #3 delete new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/pJvm/PJvmNewJavaClass.class
-End of files
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Building pJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log
deleted file mode 100644
index 6f72ea725c45..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 create new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building pJvm
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Compiling files:
-  pJvm/src/servicePJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building c
-Building pJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/pJvm/META-INF/pJvm.kotlin_module
-  out/production/pJvm/ServicePJvmNewImplKt.class
-End of files
-Building pJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt
deleted file mode 100644
index 4dbe75ff1318..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/dependencies.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-MUTED
-
-//
-//        RA                  RB
-//         rAJvm    <-------    rBJvm
-//         rAJs     <-------    rBJs
-//
-//            ^                   ^
-//            |                   |
-//        A
-//         aCommon              B
-//          aCommonClient        bCommon      R
-//            aJvmClient  <------ bJvm   <---  rJvm
-//            aJsClient   <------ bJs    <---  rJs
-//          aCommonServer
-//            aJvmServer
-//            aJsServer
-//
-//  - `rA*`, `rB*` regular dependent module groups - for testing `common-on-platform -> regular` dependency
-//  - `aCommon*`, `bCommon` - common modules
-//  - `aCommonClient`, `aCommonServer` - for testings `common -> common` dependency
-//  - aJvmClient/aJvmServer, aJsClient/aJsServer - for testing two implementation on same platform
-//  - `b*` - for testings `common-on-platform -> common-on-platform` dependency
-//  - `r*` - regular modules for testings `regular -> common-on-platform` dependency
-//
-
-//////  RA //////
-
-raJvm [jvm, edit]
-raJs [js, edit]
-
-////// RB //////
-
-rbJvm [jvm]
-rbJvm -> raJvm [compile]
-
-rbJs [js]
-rbJs -> raJs [compile]
-
-////// A //////
-
-aCommon [common, editExpectActual]
-
-aCommonClient [common]
-aCommonClient -> aCommon [compile]
-
-aCommonServer [common]
-aCommonServer -> aCommon [compile]
-
-aJvmClient [jvm, edit, editJvm]
-aJvmClient -> aCommon [expectedBy]
-aJvmClient -> aCommonClient [expectedBy]
-aJvmClient -> raJvm [compile]
-
-aJvmServer [jvm]
-aJvmServer -> aCommon [expectedBy]
-aJvmServer -> aCommonServer [expectedBy]
-aJvmServer -> raJvm [compile]
-
-aJsClient [js, edit]
-aJsClient -> aCommon [expectedBy]
-aJsClient -> aCommonClient [expectedBy]
-aJsClient -> raJs [compile]
-
-aJsServer [js]
-aJsServer -> aCommon [expectedBy]
-aJsServer -> aCommonServer [expectedBy]
-aJsServer -> raJs [compile]
-
-////// B //////
-
-bCommon [common, editExpectActual]
-bCommon -> aCommon [compile]
-
-bJvm [jvm]
-bJvm -> bCommon [expectedBy]
-bJvm -> aJvmClient [compile]
-bJvm -> raJvm [compile]
-bJvm -> rbJvm [compile]
-
-bJs [js]
-bJs -> bCommon [expectedBy]
-bJs -> aJsClient [compile]
-bJs -> raJs [compile]
-bJs -> rbJs [compile]
-
-////// R //////
-
-rJvm [jvm, edit]
-rJvm -> raJvm [compile]
-rJvm -> rbJvm [compile]
-rJvm -> bJvm [compile]
-rJvm -> aJvmClient [compile]
-
-rJs [js, edit]
-rJs -> raJs [compile]
-rJs -> rbJs [compile]
-rJs -> bJs [compile]
-rJs -> aJsClient [compile]
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log
deleted file mode 100644
index f304576d7f7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual/build.log
+++ /dev/null
@@ -1,595 +0,0 @@
-================ Step #1 create new service in aCommon =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
-
-================ Step #2 create new service in aJvmClient =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
-
-================ Step #3 create new service in aJvmServer =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
-
-================ Step #4 create new service in aJsClient =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[aJsServer] Expected function 'aCommon_platformDependentACommonNew' has no actual declaration in module
-
-================ Step #5 create new service in aJsServer =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsServer/src/serviceAJsServerNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building aJsClient
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsClient/src/serviceAJsClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  aJvmServer/src/AJvmServerNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/aJvmServer/META-INF/aJvmServer.kotlin_module
-  out/production/aJvmServer/ServiceAJvmServerNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  aJvmClient/src/AJvmClientNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #6 change new service in aCommon =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Cleaning output files:
-  out/production/aJsServer/aJsServer.js
-  out/production/aJsServer/aJsServer.meta.js
-  out/production/aJsServer/aJsServer/root-package.kjsm
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsServer/src/serviceAJsServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aJsServer/src/serviceAJsServerNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/aJsServer/aJsServer.js
-  out/production/aJsServer/aJsServer.meta.js
-  out/production/aJsServer/aJsServer/root-package.kjsm
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsServer/src/serviceAJsServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Cleaning output files:
-  out/production/aJsClient/aJsClient.js
-  out/production/aJsClient/aJsClient.meta.js
-  out/production/aJsClient/aJsClient/root-package.kjsm
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsClient/src/serviceAJsClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aJsClient/src/serviceAJsClientNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/aJsClient/aJsClient.js
-  out/production/aJsClient/aJsClient.meta.js
-  out/production/aJsClient/aJsClient/root-package.kjsm
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJsClient/src/serviceAJsClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Cleaning output files:
-  out/production/aJvmServer/META-INF/aJvmServer.kotlin_module
-  out/production/aJvmServer/ServiceACommonNewHeaderKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/aJvmServer/META-INF/aJvmServer.kotlin_module
-  out/production/aJvmServer/ServiceAJvmServerNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceACommonNewHeaderKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #7 change new service in aJvmClient: java =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Cleaning output files:
-  out/production/aJvmClient/AJvmClientNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  aJvmClient/src/AJvmClientNewJavaClass.java
-End of files
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #8 change new service in aJvmClient: kotlin =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #9 change new service in aJvmServer: java =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Cleaning output files:
-  out/production/aJvmServer/AJvmServerNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  aJvmServer/src/AJvmServerNewJavaClass.java
-End of files
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #10 change new service in aJvmServer: kotlin =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Cleaning output files:
-  out/production/aJvmServer/META-INF/aJvmServer.kotlin_module
-  out/production/aJvmServer/ServiceAJvmServerNewImplKt.class
-End of files
-Compiling files:
-  aCommon/src/serviceACommonNewHeader.kt
-  aJvmServer/src/serviceAJvmServerNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  aCommon/src/serviceACommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log
deleted file mode 100644
index 7090508e1583..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin/build.log
+++ /dev/null
@@ -1,170 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Compiling files:
-  aJsClient/src/serviceAJsClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Cleaning output files:
-  out/production/aJsClient/aJsClient.js
-  out/production/aJsClient/aJsClient.meta.js
-  out/production/aJsClient/aJsClient/root-package.kjsm
-End of files
-Compiling files:
-  aJsClient/src/serviceAJsClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/aJsClient/aJsClient.js
-  out/production/aJsClient/aJsClient.meta.js
-  out/production/aJsClient/aJsClient/root-package.kjsm
-End of files
-Building aJsClient
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log
deleted file mode 100644
index dafe59a17061..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava/build.log
+++ /dev/null
@@ -1,182 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Compiling files:
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  aJvmClient/src/AJvmClientNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Compiling files:
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Cleaning output files:
-  out/production/aJvmClient/AJvmClientNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  aJvmClient/src/AJvmClientNewJavaClass.java
-End of files
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/aJvmClient/AJvmClientNewJavaClass.class
-End of files
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Building aJvmClient
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log
deleted file mode 100644
index 4f04d4d6cc17..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin/build.log
+++ /dev/null
@@ -1,168 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Compiling files:
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Compiling files:
-  aJvmClient/src/serviceAJvmClientNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/aJvmClient/META-INF/aJvmClient.kotlin_module
-  out/production/aJvmClient/ServiceAJvmClientNewImplKt.class
-End of files
-Building aJvmClient
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log
deleted file mode 100644
index b7970ebc52e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual/build.log
+++ /dev/null
@@ -1,577 +0,0 @@
-================ Step #1 create new service in bCommon =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
-
-================ Step #2 create new service in bJvm =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
-
-================ Step #3 create new service in bJs =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJs/src/serviceBJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJvm/src/serviceBJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  bJvm/src/BJvmNewJavaClass.java
-End of files
-Cleaning output files:
-  out/production/bJvm/META-INF/bJvm.kotlin_module
-  out/production/bJvm/ServiceBJvmNewImplKt.class
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJvm/src/serviceBJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #4 change new service in bCommon =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Cleaning output files:
-  out/production/bJs/bJs.js
-  out/production/bJs/bJs.meta.js
-  out/production/bJs/bJs/root-package.kjsm
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJs/src/serviceBJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/bJs/bJs.js
-  out/production/bJs/bJs.meta.js
-  out/production/bJs/bJs/root-package.kjsm
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJs/src/serviceBJsNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Cleaning output files:
-  out/production/bJvm/META-INF/bJvm.kotlin_module
-  out/production/bJvm/ServiceBCommonNewHeaderKt.class
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJvm/src/serviceBJvmNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  bJvm/src/serviceBJvmNewImpl.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/bJvm/META-INF/bJvm.kotlin_module
-  out/production/bJvm/ServiceBJvmNewImplKt.class
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJvm/src/serviceBJvmNewImpl.kt
-End of files
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #5 change new service in bJvm: java =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Cleaning output files:
-  out/production/bJvm/BJvmNewJavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  bJvm/src/BJvmNewJavaClass.java
-End of files
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #6 change new service in bJvm: kotlin =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Cleaning output files:
-  out/production/bJvm/META-INF/bJvm.kotlin_module
-  out/production/bJvm/ServiceBJvmNewImplKt.class
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJvm/src/serviceBJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #7 change new service in bJs =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Cleaning output files:
-  out/production/bJs/bJs.js
-  out/production/bJs/bJs.meta.js
-  out/production/bJs/bJs/root-package.kjsm
-End of files
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-  bJs/src/serviceBJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Marked as dirty by Kotlin:
-  bCommon/src/serviceBCommonNewHeader.kt
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #8 delete new service in bJvm =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/bJvm/META-INF/bJvm.kotlin_module
-  out/production/bJvm/ServiceBJvmNewImplKt.class
-End of files
-Building bJvm
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[bJvm] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
-
-================ Step #9 delete new service in bJs =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/bJs/bJs.js
-  out/production/bJs/bJs.meta.js
-  out/production/bJs/bJs/root-package.kjsm
-End of files
-Building bJs
-Compiling files:
-  bCommon/src/serviceBCommonNewHeader.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-[bJs] Expected function 'bCommon_platformDependentBCommonNew' has no actual declaration in module
-
-================ Step #10 delete new service in bCommon =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/bJvm/ServiceBCommonNewHeaderKt.class
-End of files
-Building bJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log
deleted file mode 100644
index 24f682a9adf2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin/build.log
+++ /dev/null
@@ -1,170 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Compiling files:
-  rJs/src/serviceRJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Cleaning output files:
-  out/production/rJs/rJs.js
-  out/production/rJs/rJs.meta.js
-  out/production/rJs/rJs/root-package.kjsm
-End of files
-Compiling files:
-  rJs/src/serviceRJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/rJs/rJs.js
-  out/production/rJs/rJs.meta.js
-  out/production/rJs/rJs/root-package.kjsm
-End of files
-Building rJs
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log
deleted file mode 100644
index 55374270cf5c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin/build.log
+++ /dev/null
@@ -1,168 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Compiling files:
-  rJvm/src/serviceRJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Cleaning output files:
-  out/production/rJvm/META-INF/rJvm.kotlin_module
-  out/production/rJvm/ServiceRJvmNewImplKt.class
-End of files
-Compiling files:
-  rJvm/src/serviceRJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/rJvm/META-INF/rJvm.kotlin_module
-  out/production/rJvm/ServiceRJvmNewImplKt.class
-End of files
-Building rJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log
deleted file mode 100644
index 422f89c476f7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin/build.log
+++ /dev/null
@@ -1,170 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Compiling files:
-  raJs/src/serviceRaJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Cleaning output files:
-  out/production/raJs/raJs.js
-  out/production/raJs/raJs.meta.js
-  out/production/raJs/raJs/root-package.kjsm
-End of files
-Compiling files:
-  raJs/src/serviceRaJsNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/raJs/raJs.js
-  out/production/raJs/raJs.meta.js
-  out/production/raJs/raJs/root-package.kjsm
-End of files
-Building raJs
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log
deleted file mode 100644
index e880b7df5206..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin/build.log
+++ /dev/null
@@ -1,168 +0,0 @@
-================ Step #1 create new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Compiling files:
-  raJvm/src/serviceRaJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #2 edit new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJvm
-Cleaning output files:
-  out/production/raJvm/META-INF/raJvm.kotlin_module
-  out/production/raJvm/ServiceRaJvmNewImplKt.class
-End of files
-Compiling files:
-  raJvm/src/serviceRaJvmNewImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-
-================ Step #3 delete new service =================
-
-Building aCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bCommon
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aCommonClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building raJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJsClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJs
-Exit code: NOTHING_DONE
-------------------------------------------
-Cleaning output files:
-  out/production/raJvm/META-INF/raJvm.kotlin_module
-  out/production/raJvm/ServiceRaJvmNewImplKt.class
-End of files
-Building raJvm
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-Building aJvmServer
-Exit code: NOTHING_DONE
-------------------------------------------
-Building aJvmClient
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rbJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building bJvm
-Exit code: NOTHING_DONE
-------------------------------------------
-Building rJvm
-Exit code: NOTHING_DONE
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt
deleted file mode 100644
index 0228de5e71d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt
deleted file mode 100644
index f3809d038666..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log
deleted file mode 100644
index b165b6aac081..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/b.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt
deleted file mode 100644
index 2ff821a2d527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() = "other"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt
deleted file mode 100644
index db702d74fea1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    println(a() + b() + other.other())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt
deleted file mode 100644
index 14b203d66ae8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-var a = "a"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt
deleted file mode 100644
index ac2faa5147e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-// TODO add var
-package test
-
-var b = "b"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log
deleted file mode 100644
index b165b6aac081..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/b.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt
deleted file mode 100644
index aeb30beb2442..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-var other = "other"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt
deleted file mode 100644
index 024de4a9c42e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    val x = a + b + other.other
-    a = "aa"
-    b = "bb"
-    other.other = "other.other"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/A.kt.new
deleted file mode 100644
index c31fc881e2be..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/A.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/build.log
deleted file mode 100644
index 9d2a2de89318..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/funA.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/FunAKt.class
-  out/production/module/use/UseAKt.class
-End of files
-Compiling files:
-  src/funA.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/funA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/funA.kt
deleted file mode 100644
index 65abdd939e70..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/funA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun A(a: Int = 1){}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/useA.kt
deleted file mode 100644
index 9f7e7f2a233a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addClass/useA.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log
deleted file mode 100644
index 3d8ecd171a19..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/foo2.kt
-End of files
-Marked as dirty by Kotlin:
-  src/foo1.kt
-  src/use.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/Foo1Kt.class
-  out/production/module/use/UseKt.class
-End of files
-Compiling files:
-  src/foo1.kt
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt
deleted file mode 100644
index bd7697f40356..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Any) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new
deleted file mode 100644
index ac48e24c9e5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt
deleted file mode 100644
index e9dbe9f4ac12..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    f(1)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
deleted file mode 100644
index 7563b0f4d1d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package a
-
-class Outer {
-    inner class B(x: String)
-
-    fun A1(x: Any) = x
-    fun A2(x: Any) = x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
deleted file mode 100644
index b1b7bcb03775..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new
+++ /dev/null
@@ -1,13 +0,0 @@
-package a
-
-class Outer {
-    inner class B(x: String)
-
-    @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-    typealias A1 = B
-    @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-    private typealias A2 = B
-
-    fun A1(x: Any) = x
-    fun A2(x: Any) = x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
deleted file mode 100644
index d61b70bda0cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun bar() {
-    a.Outer().A1("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
deleted file mode 100644
index c06dc193b88c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun baz() {
-    a.Outer().A2("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
deleted file mode 100644
index 2b216fb7c017..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addMemberTypeAlias/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/a/Outer$B.class
-  out/production/module/a/Outer.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a1Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/A1UsageKt.class
-End of files
-Compiling files:
-  src/a1Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
deleted file mode 100644
index e7bbb5080ec9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class B(x: String)
-
-fun A1(x: Any) = x
-fun A2(x: Any) = x
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
deleted file mode 100644
index 3e0d138c4541..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package a
-
-class B(x: String)
-typealias A1 = B
-private typealias A2 = B
-
-fun A1(x: Any) = x
-fun A2(x: Any) = x
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
deleted file mode 100644
index 78523ab3a177..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun bar() {
-    a.A1("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
deleted file mode 100644
index eaf8e2a62476..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun baz() {
-    a.A2("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
deleted file mode 100644
index 4f5133e9753a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/a/AKt.class
-  out/production/module/a/B.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a1Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/A1UsageKt.class
-End of files
-Compiling files:
-  src/a1Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/build.log
deleted file mode 100644
index 4a4663318abc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/build.log
+++ /dev/null
@@ -1,34 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt
deleted file mode 100644
index 73047748dac7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-const val b: Byte = 100
-const val s: Short = 20000
-const val i: Int = 2000000
-const val l: Long = 2000000000000L
-const val f: Float = 3.14f
-const val d: Double = 3.14
-const val bb: Boolean = true
-const val c: Char = '\u03c0' // pi symbol
-
-const val str: String = ":)"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.1
deleted file mode 100644
index 9fe38e759281..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.1
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-const val b: Byte = 50 + 50
-const val s: Short = 10000 + 10000
-const val i: Int = 1000000 + 1000000
-const val l: Long = 1000000000000L + 1000000000000L
-const val f: Float = 0.0f + 3.14f
-const val d: Double = 0.0 + 3.14
-const val bb: Boolean = !false
-const val c: Char = '\u03c0' // pi symbol
-
-const val str: String = ":)"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.2
deleted file mode 100644
index d0df4060261b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/const.kt.new.2
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-const val b: Byte = 0
-const val s: Short = 0
-const val i: Int = 0
-const val l: Long = 0
-const val f: Float = 0.0f
-const val d: Double = 0.0
-const val bb: Boolean = false
-const val c: Char = 'x'
-
-const val str: String = ":("
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/usage.kt
deleted file mode 100644
index afb25dfcf37e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/allConstants/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated("$b $s $i $l $f $d $bb $c $str")
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/annotations.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/annotations.kt
deleted file mode 100644
index c3d5c542a456..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/annotations.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package test
-
-annotation class Anno
-
-@Anno fun f() {
-}
-
-@Anno val v1 = ""
-
-var v2: String
-    get() = ""
-    @Anno set(value) {
-    }
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/build.log
deleted file mode 100644
index ce955a3768c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/OtherKt.class
-End of files
-Compiling files:
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt
deleted file mode 100644
index 092462c70e07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun dummyFunction() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/annotations/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt
deleted file mode 100644
index 842232877ded..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun foo() = object {
-    fun bar() = ":("
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new
deleted file mode 100644
index 37d68224ae2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package a
-
-fun foo() = object {
-    fun baz() = ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/build.log
deleted file mode 100644
index ccfe1e400ace..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/a/AKt$foo$1.class
-  out/production/module/a/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt
deleted file mode 100644
index acc1e2b0f5a6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-import a.foo
-
-fun bar() = foo()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log
deleted file mode 100644
index a958ab5ed8f5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log
+++ /dev/null
@@ -1,33 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage1Kt.class
-End of files
-Compiling files:
-  src/usage1.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage2.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage2Kt.class
-End of files
-Compiling files:
-  src/usage2.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage1.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage1Kt.class
-End of files
-Compiling files:
-  src/usage1.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt
deleted file mode 100644
index 6b9eeddad033..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() = ""
-
-fun baz() = bar()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new
deleted file mode 100644
index 8acd1a28007a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() = 1
-
-fun baz() = bar()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt
deleted file mode 100644
index 07980db6a94c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun bar() = foo()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt
deleted file mode 100644
index 07980db6a94c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun bar() = foo()
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log
deleted file mode 100644
index d7c033783703..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BarKt.class
-End of files
-Cleaning output files:
-  out/production/module/test/FooKt.class
-End of files
-Compiling files:
-  src/foo.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt
deleted file mode 100644
index b17f6633603c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun foo() = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new
deleted file mode 100644
index 8a4c388ca29f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun foo() = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log
deleted file mode 100644
index 0c97baf5ae29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/Klass.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt
deleted file mode 100644
index 4ac2a4efd187..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package inline
-
-class Klass {
-    inline fun f(body: () -> Unit) {
-        println("i'm inline function")
-        body()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new
deleted file mode 100644
index 461d943cf4f9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package inline
-
-class Klass {
-    inline fun f(body: () -> Unit) {
-        body()
-        println("i'm inline function")
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt
deleted file mode 100644
index 578cf272f917..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt
deleted file mode 100644
index 204a8e2537fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    inline.Klass().f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
deleted file mode 100644
index 0413c6c6531b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt
deleted file mode 100644
index cd3256a76121..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new
deleted file mode 100644
index 49b604cd74f2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt
deleted file mode 100644
index dbeb3fbf86cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(Klass.CONST + Klass.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt
deleted file mode 100644
index 1b0178fd9be2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.new.2
deleted file mode 100644
index 1b0178fd9be2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/A.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/build.log
deleted file mode 100644
index af487848341f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/build.log
+++ /dev/null
@@ -1,18 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/other.kt
deleted file mode 100644
index dc156549ce55..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRecreated/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun other() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt
deleted file mode 100644
index 1b0178fd9be2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/A.kt.delete.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/build.log
deleted file mode 100644
index 94979d23f97b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/other.kt
deleted file mode 100644
index dc156549ce55..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classRemoved/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun other() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/build.log
deleted file mode 100644
index 63944eb03dbf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/class.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt
deleted file mode 100644
index 207a0d6ff207..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class Klass {
-    fun foo() = ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new
deleted file mode 100644
index 7100d314c780..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class Klass {
-    fun foo() = 123
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/usage.kt
deleted file mode 100644
index 316732663ce3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage(a: Klass) {
-    a.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/build.log
deleted file mode 100644
index f9702be2ea8f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/class.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt
deleted file mode 100644
index 3f1b899222d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Klass {
-    fun foo() = ":)"
-
-    fun bar() = ":("
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new
deleted file mode 100644
index 8ac6fd17f05b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-// swapped functions
-class Klass {
-    fun bar() = ":("
-
-    fun foo() = ":)"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt
deleted file mode 100644
index 2ee98c0e4be3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun usage(a: Klass) {
-    a.foo()
-    a.bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
deleted file mode 100644
index debae4135b3c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting an expression
-
-================ Step #2 =================
-
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
deleted file mode 100644
index 2171b8f5fcff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package f
-
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
deleted file mode 100644
index 406f84ac5b63..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    f.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
deleted file mode 100644
index 568fde17ee61..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    f.f(
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
deleted file mode 100644
index 406f84ac5b63..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    f.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
deleted file mode 100644
index c172058ffdaf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting an expression
-
-================ Step #2 =================
-
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
deleted file mode 100644
index 99cec0dbea1a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
deleted file mode 100644
index c7eec515ee80..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f(
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
deleted file mode 100644
index 6a249e3d7491..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/OtherKt.class
-End of files
-Cleaning output files:
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting an expression
-
-================ Step #2 =================
-
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt
deleted file mode 100644
index 99cec0dbea1a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt
deleted file mode 100644
index 81a9dfacc104..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun other() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1
deleted file mode 100644
index c7eec515ee80..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f(
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log
deleted file mode 100644
index ed84bb8e4782..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/OtherKt.class
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/other.kt
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting an expression
-
-================ Step #2 =================
-
-Compiling files:
-  src/other.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt
deleted file mode 100644
index 99cec0dbea1a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun f() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt
deleted file mode 100644
index 81a9dfacc104..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun other() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1
deleted file mode 100644
index 7eddc99ab2b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package new
-
-fun other() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1
deleted file mode 100644
index c7eec515ee80..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f(
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2
deleted file mode 100644
index 05a6473592ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
deleted file mode 100644
index 08330879b7ba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/other.kt
-  src/usage.kt
-Cleaning output files:
-  out/production/module/B.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/other.kt
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Expecting an expression
-
-================ Step #2 =================
-
-Compiling files:
-  src/other.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt
deleted file mode 100644
index 3788dbbcbc2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class A {
-    fun f() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt
deleted file mode 100644
index b6b9ec3ee76e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package new
-
-fun f() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt
deleted file mode 100644
index 6633b42e5b8b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class B {
-    fun f() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1
deleted file mode 100644
index 25a4443267c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1
+++ /dev/null
@@ -1,7 +0,0 @@
-package new
-
-class B {
-    fun f() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt
deleted file mode 100644
index 214714c7c0ef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-import new.*
-
-fun main(args: Array<String>) {
-    A().f()
-    B().f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1
deleted file mode 100644
index 5379a61c3e8e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1
+++ /dev/null
@@ -1,6 +0,0 @@
-import new.*
-
-fun main(args: Array<String>) {
-    B().f(
-    A().f(
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2
deleted file mode 100644
index 0ccf0889261c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-import new.*
-fun main(args: Array<String>) {
-    A().f()
-    B().f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/build.log
deleted file mode 100644
index 7bee54522bb2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: FOO
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt
deleted file mode 100644
index 61ac808acc88..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-const val FOO = "foo"
-const val BAR = "bar"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
deleted file mode 100644
index fb3656ffd527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-const val BAR = "bar"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt
deleted file mode 100644
index edeefdc40b5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage() {
-    println(FOO)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
deleted file mode 100644
index 40cde0ce0558..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun usage() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/build.log
deleted file mode 100644
index 9a77b7869a54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt
deleted file mode 100644
index 03e73ad56a10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-const val CONST = "foo"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
deleted file mode 100644
index 644301b0c688..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-const val CONST = "bar"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/usage.kt
deleted file mode 100644
index 89fc6b89f3c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantValueChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage() {
-    println(CONST)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/build.log
deleted file mode 100644
index 7e05c0aef736..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt
deleted file mode 100644
index 8bdd5ae5b5d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-const val CONST = "foo"
-
-class Klass {
-    companion object {
-        const val CONST = "bar"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/usage.kt
deleted file mode 100644
index 81506d4f37f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/constantsUnchanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(CONST + Klass.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt
deleted file mode 100644
index 21a27277384b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1
deleted file mode 100644
index e55b1518b83c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt
deleted file mode 100644
index eabe4db64635..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt
deleted file mode 100644
index 1cf6ddc7b3b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log
deleted file mode 100644
index 6120b0c6beba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/createA.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/B.class
-  out/production/module/foo/CreateAKt.class
-  out/production/module/foo/UseAKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/createA.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt
deleted file mode 100644
index b563c0896036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createB() {
-    B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt
deleted file mode 100644
index b156f1532aea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt
deleted file mode 100644
index 3b441f0463cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useB(b: B) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt
deleted file mode 100644
index e55b1518b83c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1
deleted file mode 100644
index 21a27277384b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt
deleted file mode 100644
index eabe4db64635..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt
deleted file mode 100644
index 1cf6ddc7b3b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log
deleted file mode 100644
index 6b9705bd9013..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log
+++ /dev/null
@@ -1,47 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/B.class
-  out/production/module/foo/CreateADefaultKt.class
-  out/production/module/foo/CreateANonDefaultKt.class
-  out/production/module/foo/UseAKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Too many arguments for public constructor A() defined in foo.A
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/createADefault.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt
deleted file mode 100644
index 30f71d1945db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt
deleted file mode 100644
index b563c0896036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createB() {
-    B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt
deleted file mode 100644
index b156f1532aea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt
deleted file mode 100644
index 3b441f0463cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useB(b: B) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/build.log
deleted file mode 100644
index 9c5c62e65b49..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault.kt
-  src/useNonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefaultKt.class
-  out/production/module/test/UseNonDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault.kt
-  src/useNonDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt
deleted file mode 100644
index 1f588b0f8c3f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun f(x: Any) {
-    println("f(x: Any)")
-}
-
-fun f(x: Int, y: Int) {
-    println("f(x=$x, y=$y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1
deleted file mode 100644
index e77870d39b34..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun f(x: Any) {
-    println("f(x: Any)")
-}
-
-fun f(x: Int, y: Int = 2) {
-    println("f(x=$x, y=$y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt
deleted file mode 100644
index 73e68e1b5e97..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault1() {
-    f(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt
deleted file mode 100644
index 26114226465e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useNonDefault() {
-    f(10, 20)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/build.log
deleted file mode 100644
index 425c4a969b08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt
deleted file mode 100644
index edc19c98005a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(x: Int = 10) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new
deleted file mode 100644
index 4a286548bb2c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(x: Int = 20) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt
deleted file mode 100644
index 32cc748fe734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useDefault() {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt
deleted file mode 100644
index a6201ac0864d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useNonDefault() {
-    f(15)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt
deleted file mode 100644
index e55b1518b83c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1
deleted file mode 100644
index 595bfd1ae983..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int = 11)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt
deleted file mode 100644
index a0a7d08e730c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A(20)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt
deleted file mode 100644
index 1cf6ddc7b3b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log
deleted file mode 100644
index 760428f3e58a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt
deleted file mode 100644
index e8df2c0192d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(15)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt
deleted file mode 100644
index b563c0896036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createB() {
-    B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt
deleted file mode 100644
index b156f1532aea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt
deleted file mode 100644
index 3b441f0463cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useB(b: B) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt
deleted file mode 100644
index e55b1518b83c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int = 10)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1
deleted file mode 100644
index f9474759c7d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class A(x: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt
deleted file mode 100644
index eabe4db64635..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2
deleted file mode 100644
index 4af1ce1941a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A(5)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt
deleted file mode 100644
index 1cf6ddc7b3b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log
deleted file mode 100644
index dbd011c7bdb9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log
+++ /dev/null
@@ -1,49 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/B.class
-  out/production/module/foo/CreateADefaultKt.class
-  out/production/module/foo/CreateANonDefaultKt.class
-  out/production/module/foo/UseAKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-No value passed for parameter 'x'
-No value passed for parameter 'x'
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2
deleted file mode 100644
index f413fc964cbd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A(5)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt
deleted file mode 100644
index 30f71d1945db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt
deleted file mode 100644
index b563c0896036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createB() {
-    B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt
deleted file mode 100644
index b156f1532aea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt
deleted file mode 100644
index 3b441f0463cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useB(b: B) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/build.log
deleted file mode 100644
index a2c286b758a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/build.log
+++ /dev/null
@@ -1,40 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault.kt
-  src/useNonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefaultKt.class
-  out/production/module/test/UseNonDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault.kt
-  src/useNonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-No value passed for parameter 'x'
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-  src/useDefault.kt
-  src/useNonDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt
deleted file mode 100644
index 1ca7cdfff4de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Int = 1) {
-    println(x)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1
deleted file mode 100644
index 93139f5a6882..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Int) {
-    println(x)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt
deleted file mode 100644
index ebf29c4495a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault() {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2
deleted file mode 100644
index 6b03cc95a854..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault() {
-    f(5)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt
deleted file mode 100644
index 0d213872ad1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useNonDefault() {
-    f(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/build.log
deleted file mode 100644
index 63fae62a61e3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault1.kt
-  src/useDefault2.kt
-  src/useNonDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefault1Kt.class
-  out/production/module/test/UseDefault2Kt.class
-  out/production/module/test/UseNonDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault1.kt
-  src/useDefault2.kt
-  src/useNonDefault.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-No value passed for parameter 'y'
-No value passed for parameter 'y'
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-  src/useDefault1.kt
-  src/useDefault2.kt
-  src/useNonDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt
deleted file mode 100644
index 3a7664d67861..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Int = 1, y: Int = 2) {
-    println("f(x=$x, y=$y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1
deleted file mode 100644
index 75d53a41009a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Int = 1, y: Int) {
-    println("f(x=$x, y=$y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt
deleted file mode 100644
index 276164b57151..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault1() {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2
deleted file mode 100644
index 4c4f45e0bf70..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault1() {
-    f(y=6)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt
deleted file mode 100644
index 85d2ec30364f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault2() {
-    f(5)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2
deleted file mode 100644
index a551748a2d3d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault2() {
-    f(5, 6)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt
deleted file mode 100644
index 26114226465e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useNonDefault() {
-    f(10, 20)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt
deleted file mode 100644
index a41723cbeb7c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-import inline.*
-
-class UsageVal {
-    val x: Int by Inline()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt
deleted file mode 100644
index 02b4b418fb45..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-import inline.*
-
-class UsageVar {
-    var x: Int by Inline()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
deleted file mode 100644
index 2de0bdbba740..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log
+++ /dev/null
@@ -1,48 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineGetKt.class
-End of files
-Compiling files:
-  src/inlineGet.kt
-End of files
-Marked as dirty by Kotlin:
-  src/UsageVal.kt
-  src/UsageVar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageVal.class
-  out/production/module/usage/UsageVar.class
-End of files
-Compiling files:
-  src/UsageVal.kt
-  src/UsageVar.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineSetKt.class
-End of files
-Compiling files:
-  src/inlineSet.kt
-End of files
-Marked as dirty by Kotlin:
-  src/UsageVar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageVar.class
-End of files
-Compiling files:
-  src/UsageVar.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt
deleted file mode 100644
index b10bc0a71dd9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-class Inline
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
deleted file mode 100644
index 310ee0540d5e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-inline operator fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int {
-    return 0
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
deleted file mode 100644
index 48363763f128..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-inline operator fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int {
-    return 1
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
deleted file mode 100644
index 6f6684e1595c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-inline operator fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
-    println(value)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
deleted file mode 100644
index d85c786fbf53..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-inline operator fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
-    println(value * 2)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt
deleted file mode 100644
index 8e918b81f47c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-import inline.Inline
-
-class UsageVal {
-    val x: Int by Inline()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt
deleted file mode 100644
index 3221201c2776..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-import inline.Inline
-
-class UsageVar {
-    var x: Int by Inline()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
deleted file mode 100644
index 4c198b355d16..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log
+++ /dev/null
@@ -1,48 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/Inline.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/UsageVal.kt
-  src/UsageVar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageVal.class
-  out/production/module/usage/UsageVar.class
-End of files
-Compiling files:
-  src/UsageVal.kt
-  src/UsageVar.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/Inline.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/UsageVar.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageVar.class
-End of files
-Compiling files:
-  src/UsageVar.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
deleted file mode 100644
index 4e82a0cda3f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-class Inline {
-    inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int {
-        return 0
-    }
-
-    inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
-        println(value)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
deleted file mode 100644
index fcf08146bf55..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1
+++ /dev/null
@@ -1,13 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-class Inline {
-    inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int {
-        return 1
-    }
-
-    inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
-        println(value)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
deleted file mode 100644
index 05c7f9e1835d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2
+++ /dev/null
@@ -1,13 +0,0 @@
-package inline
-
-import kotlin.reflect.KProperty
-
-class Inline {
-    inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int {
-        return 1
-    }
-
-    inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) {
-        println(value * 2)
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt
deleted file mode 100644
index ba9f1988a49e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt
deleted file mode 100644
index d14755d91f3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun a(ref: List<String>) {
-    b(ref)
-    println(":)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt
deleted file mode 100644
index 7c34849d5f2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun b(ref: List<String>) {
-    a(ref)
-    println(":)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/build.log
deleted file mode 100644
index eef6764ff167..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/dependencyClassReferenced/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log
deleted file mode 100644
index fbb3ceecee7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: test
-An annotation argument must be a compile-time constant
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt
deleted file mode 100644
index c2cc75a6691c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-const val CONST = "foo"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt
deleted file mode 100644
index 80d9d8732280..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-@Deprecated(test.CONST)
-val usage = ""
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
deleted file mode 100644
index 98e6b08649a9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/InlineKt.class
-End of files
-Compiling files:
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: test
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt
deleted file mode 100644
index fb5e59f5432e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt
deleted file mode 100644
index 98840f6537a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    test.f {
-        println("to be inlined")
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/a.kt
deleted file mode 100644
index 058137655b81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt
deleted file mode 100644
index d838bdff1a4f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new
deleted file mode 100644
index 75675fcebb44..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/build.log
deleted file mode 100644
index 669e2b72119d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/bar/CKt.class
-  out/production/module/foo/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-  src/c.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt
deleted file mode 100644
index ba081bb0bbde..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-fun c() = "c"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new
deleted file mode 100644
index e51d910bb9d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun c() = "c"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log
deleted file mode 100644
index bcf759c201e6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build-with-scope-expansion.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/fun1.kt
-  src/fun2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public fun function(): Unit defined in test in file fun2.kt, public fun function(): Unit defined in test
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build.log
deleted file mode 100644
index f22853c57fbc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Fun2Kt.class
-End of files
-Compiling files:
-  src/fun2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public fun function(): Unit defined in test in file fun2.kt, public fun function(): Unit defined in test
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun1.kt
deleted file mode 100644
index 539d6344c39c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun function() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt
deleted file mode 100644
index 897d69e36415..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val x = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new
deleted file mode 100644
index 6621c5f63e7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-val x = 1
-
-fun function() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log
deleted file mode 100644
index b7b4c165c731..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build-with-scope-expansion.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/fun1.kt
-  src/fun2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public constructor function() defined in test.function, public fun function(): Unit defined in test
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
deleted file mode 100644
index dab333be49ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Fun2Kt.class
-End of files
-Compiling files:
-  src/fun2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting overloads: public constructor function() defined in test.function, public fun function(): Unit defined in test
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
deleted file mode 100644
index 539d6344c39c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun function() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
deleted file mode 100644
index 897d69e36415..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val x = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
deleted file mode 100644
index bf81e8e2e1d4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-val x = 1
-
-class function
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/build.log
deleted file mode 100644
index 7813ba95add4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Y.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/X$main$1.class
-  out/production/module/X.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt
deleted file mode 100644
index 98d04fc4df3c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class Y {
-    fun foo(f: () -> Unit) {
-        f()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new
deleted file mode 100644
index 299cd80a4104..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-class Y {
-    inline fun foo(f: () -> Unit) {
-        f()
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/usage.kt
deleted file mode 100644
index ac2a7aff5547..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionBecameInline/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class X {
-    fun main() {
-        Y().foo {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/A.kt
deleted file mode 100644
index 109bca0ace79..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A(val x: Int)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/build.log
deleted file mode 100644
index 33f783959c93..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt
deleted file mode 100644
index c15c6153a602..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun useA(a: A) { a.x }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/functionReferencingClass/useA.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Bar.kt
deleted file mode 100644
index d10dda29c092..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Bar.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package test
-class Bar
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt
deleted file mode 100644
index de4f811f0b10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package test
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/build.log
deleted file mode 100644
index 56c874a71d5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/independentClasses/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Foo.class
-End of files
-Compiling files:
-  src/Foo.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log
deleted file mode 100644
index cbce054c33e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useInline.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/UseInlineKt.class
-End of files
-Compiling files:
-  src/useInline.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt
deleted file mode 100644
index 80d71e901a35..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new
deleted file mode 100644
index d2c5cd8c63f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/inline.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-fun f(body: () -> Unit) {
-    println("i'm not an inline function")
-    body()
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt
deleted file mode 100644
index 26057ad0f30a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionBecomesNonInline/useInline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-fun useF() {
-    f { println("useF") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log
deleted file mode 100644
index 3ebcf40cc653..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt
deleted file mode 100644
index 8e0180d263a1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/foo.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class A {
-    inline fun foo(f: () -> Unit) {
-        f()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt
deleted file mode 100644
index c68615f0a0f9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun usage() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new
deleted file mode 100644
index 2b569d97a7ef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionUsageAdded/usage.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usage() {
-    A().foo {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt
deleted file mode 100644
index 8ebdd1cbc447..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package test
-
-inline fun a(body: () -> Unit) {
-    println("i'm inline function a")
-    body()
-}
-
-fun main(args: Array<String>) {
-    b { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new
deleted file mode 100644
index b2916dd19e8f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new
+++ /dev/null
@@ -1,10 +0,0 @@
-package test
-
-inline fun a(body: () -> Unit) {
-    body()
-    println("i'm inline function a")
-}
-
-fun main(args: Array<String>) {
-    b { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt
deleted file mode 100644
index 4f60bafa38c0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-inline fun b(body: () -> Unit) {
-    println("I'm inline function b")
-    body()
-    a { println("To be inlined from b") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log
deleted file mode 100644
index 1a5df786f0df..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log
+++ /dev/null
@@ -1,33 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log
deleted file mode 100644
index 3048feceb650..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-  out/production/module/inline/Klass.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt
deleted file mode 100644
index 9edab4e55544..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package inline
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
-
-class Klass {
-    inline fun f(body: () -> Unit) {
-        println("i'm inline function")
-        body()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt
deleted file mode 100644
index ed756cfe5f1e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package usage
-
-fun main(args: Array<String>) {
-    inline.f { println("to be inlined") }
-    inline.Klass().f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/build.log
deleted file mode 100644
index c1da0ac53cdb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useG.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UseGKt.class
-End of files
-Compiling files:
-  src/useG.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt
deleted file mode 100644
index 74f00003d473..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package inline
-
-inline fun f(): String =
-        "inline.f()"
-
-inline fun g(): String =
-        "inline.g()"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new
deleted file mode 100644
index 14c3753b9d93..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-inline fun f(): String =
-        "inline.f()"
-
-
-
-inline fun g(): String =
-        "inline.g()"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt
deleted file mode 100644
index d2155ae631b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useF() {
-    inline.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt
deleted file mode 100644
index 24cf31b012b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun useG() {
-    inline.g()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log
deleted file mode 100644
index 324a693c886a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/InlineKt.class
-  out/production/module/foo/UsageKt.class
-End of files
-Compiling files:
-  src/inline.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt
deleted file mode 100644
index 0e41c31e1efc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun f(): Int = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new
deleted file mode 100644
index 891f70481be5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-inline fun f(): Int = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt
deleted file mode 100644
index 2a8b034f9867..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useF() {
-    println(f())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new
deleted file mode 100644
index 6f5f66b97736..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo
-
-fun useF() {
-    println(f())
-    println(f())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log
deleted file mode 100644
index b908417e51c3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt
deleted file mode 100644
index f573f09d9777..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-fun test() {
-    oldInlineFun()
-}
-
-inline
-private fun oldInlineFun() {
-    println("oldInlineFun")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new
deleted file mode 100644
index c1fcbf02c30c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new
+++ /dev/null
@@ -1,16 +0,0 @@
-package foo
-
-inline
-private fun newInlineFun() {
-    println("newInlineFun")
-}
-
-fun test() {
-    newInlineFun()
-    oldInlineFun()
-}
-
-inline
-private fun oldInlineFun() {
-    println("oldInlineFun")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
deleted file mode 100644
index d2cee8477259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/A.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useSetter.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UseSetterKt.class
-End of files
-Compiling files:
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/A.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useGetter.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage2/UseGetterKt.class
-End of files
-Compiling files:
-  src/useGetter.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
deleted file mode 100644
index 9cc37e4b71bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package inline
-
-class A {
-    var z = 0
-
-    inline var f: Int
-        get() = z
-        set(p: Int) {
-            z = p
-        }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
deleted file mode 100644
index 299071674f1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.1
+++ /dev/null
@@ -1,11 +0,0 @@
-package inline
-
-class A {
-    var z = 0
-
-    inline var f: Int
-        get() = z
-        set(p: Int) {
-            z = p + 1
-        }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
deleted file mode 100644
index 8943a2e417f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/inline.kt.new.2
+++ /dev/null
@@ -1,11 +0,0 @@
-package inline
-
-class A {
-    var z = 0
-
-    inline var f: Int
-        get() = z + 1
-        set(p: Int) {
-            z = p + 1
-        }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log
deleted file mode 100644
index 47e7a152b4ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/js-build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/inline.kt
-  src/useGetter.kt
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/inline.kt
-  src/useGetter.kt
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
deleted file mode 100644
index 8202ad48f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useGetter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage2
-
-fun useGetter() = inline.A().f
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
deleted file mode 100644
index 131c1a197329..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyInClass/useSetter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun a() {
-    inline.A().f = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
deleted file mode 100644
index 9f1d5f3a87ec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useSetter.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UseSetterKt.class
-End of files
-Compiling files:
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useGetter.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage2/UseGetterKt.class
-End of files
-Compiling files:
-  src/useGetter.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
deleted file mode 100644
index 89b4af8b1572..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-var z = 0
-
-inline var f: Int
-    get() = z
-    set(p: Int) {
-        z = p
-    }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
deleted file mode 100644
index 4e36b0312afe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.1
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-var z = 0
-
-inline var f: Int
-    get() = z
-    set(p: Int) {
-        z = p + 1
-    }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
deleted file mode 100644
index cd58c2f3b9ac..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/inline.kt.new.2
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-var z = 0
-
-inline var f: Int
-    get() = z + 1
-    set(p: Int) {
-        z = p + 1
-    }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log
deleted file mode 100644
index 47e7a152b4ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/inline.kt
-  src/useGetter.kt
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/inline.kt
-  src/useGetter.kt
-  src/useSetter.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
deleted file mode 100644
index 40dd4f9a7744..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useGetter.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage2
-
-fun useGetter() = inline.f
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
deleted file mode 100644
index 8f373aa1881d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/useSetter.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun a() {
-    inline.f = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log
deleted file mode 100644
index cbce054c33e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useInline.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/UseInlineKt.class
-End of files
-Compiling files:
-  src/useInline.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/directives.txt
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt
deleted file mode 100644
index e3a7cc6b3fc3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/dummy.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-fun dontUseF() {
-    println("Don't use f")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt
deleted file mode 100644
index 68613324f2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline suspend fun f(body: () -> Unit) {
-    println("i'm inline suspend function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new
deleted file mode 100644
index 0858af3d7cf8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/inline.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package inline
-
-inline suspend fun f(body: () -> Unit) {
-    body()
-    println("i'm inline suspend function")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt
deleted file mode 100644
index 370f5a8a595b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/useInline.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package inline
-
-suspend fun useF() {
-    f { println("useF") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log
deleted file mode 100644
index d5bbb4e2256a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usesG.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsesGKt.class
-End of files
-Compiling files:
-  src/usesG.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt
deleted file mode 100644
index a07b33dfcec4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-inline fun f() {
-    println("inline.f")
-}
-
-inline fun g() {
-    println("inline.g")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new
deleted file mode 100644
index 7240b129efed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package inline
-
-inline fun f() {
-    println("inline.f")
-}
-
-inline fun g() {
-    println("inline.g changed")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt
deleted file mode 100644
index 12833a24b041..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun testF() {
-    inline.f()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt
deleted file mode 100644
index a24221d378ad..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun testG() {
-    inline.g()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log
deleted file mode 100644
index 0dd2fd08c982..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt
deleted file mode 100644
index 5e0e29b4db76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-fun test() {
-    println(f())
-}
-
-inline fun f(): Int = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1
deleted file mode 100644
index e50b3e84df87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1
+++ /dev/null
@@ -1,7 +0,0 @@
-package foo
-
-fun test() {
-    println(f())
-}
-
-inline fun f(): Int = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2
deleted file mode 100644
index 71ccb6d1fbd5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-fun test() {
-    println(f())
-    println(g())
-}
-
-inline fun f(): Int = 1
-inline fun g(): Int = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt
deleted file mode 100644
index 327261200300..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-abstract class A {
-    inner class Inner(val x: String)
-}
-abstract class B : A()
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt
deleted file mode 100644
index 77288668a6a6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO add var
-package test
-
-class C : B() {
-    val i = Inner("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log
deleted file mode 100644
index 0af690511c30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/C.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt
deleted file mode 100644
index 7549d7399086..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main() {
-    C().i.x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt
deleted file mode 100644
index 859b0ed8526f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-internal class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new
deleted file mode 100644
index ead68452a1f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-internal class ClassA() {
-    public fun meth1() {}
-    public val x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalClassChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt
deleted file mode 100644
index 6402cd3e87af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class ClassA() {
-    public fun meth1() {}
-    internal fun f() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new
deleted file mode 100644
index 5a13f1073ccf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class ClassA() {
-    public fun meth1() {}
-    internal fun f(arg: Int) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
deleted file mode 100644
index 4e3c78d004de..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/TypeAlias.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package foo
-
-internal typealias TypeAlias = Int
-internal typealias TypeAlias2 = TypeAlias
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/build.log
deleted file mode 100644
index 01bfe5306912..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/UseTypeAliasKt.class
-End of files
-Compiling files:
-  src/useTypeAlias.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
deleted file mode 100644
index 03499eba7be5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-internal fun useTypeAlias(x: TypeAlias) {
-    x.toString()
-}
-
-internal fun useTypeAlias2(x: TypeAlias2) {
-    x.toString()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealias/useTypeAlias.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt
deleted file mode 100644
index 6f139507e8fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/TypeAlias.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class C
-
-internal typealias CAlias = C
-internal typealias CAlias2 = CAlias
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log
deleted file mode 100644
index 5a335ab7fa88..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseTypeAliasConstructorKt.class
-End of files
-Compiling files:
-  src/useTypeAliasConstructor.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt
deleted file mode 100644
index 7579f4a453d3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-val c = CAlias()
-val c2 = CAlias2()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasConstructor/useTypeAliasConstructor.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt
deleted file mode 100644
index 12e479b2785d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/TypeAlias.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class C {
-    companion object
-}
-
-internal typealias CAlias = C
-internal typealias CAlias2 = CAlias
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/build.log
deleted file mode 100644
index 245b2ea54289..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseTypeAliasObjectKt.class
-End of files
-Compiling files:
-  src/useTypeAliasObject.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt
deleted file mode 100644
index 93e0cb1c07d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-val cc = CAlias
-val cc2 = CAlias2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/internalTypealiasObject/useTypeAliasObject.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt
deleted file mode 100644
index 2924f1dad8ba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun foo() {
-    class X {
-        fun bar() = 111
-    }
-
-    X().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt.new
deleted file mode 100644
index c1209c13075d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/a.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-package test
-
-fun foo() {
-    class X {
-        fun bar() = 111
-        fun baz() = ":)"
-    }
-
-    X().bar()
-    X().baz()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/build.log
deleted file mode 100644
index c325a2760235..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt$foo$X.class
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/unrelated.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/unrelated.kt
deleted file mode 100644
index f9d3d65eecfa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/localClassChanged/unrelated.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package unrelated
-
-fun main(args: Array<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/a.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.new.1
deleted file mode 100644
index 43c42f1453b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/b.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-class Foo
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/build.log
deleted file mode 100644
index f4a45aa0f2db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Foo.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Foo.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveClass/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new
deleted file mode 100644
index 5495f8ba80d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package bar
-
-class Foo
-
-fun bar() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt
deleted file mode 100644
index bf4ea3d98f0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package bar
-
-private fun dummy() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
deleted file mode 100644
index 64efa2626b67..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AKt.class
-  out/production/module/foo/Foo.class
-End of files
-Marked as dirty by Kotlin:
-  src/useClass.kt
-Cleaning output files:
-  out/production/module/baz/UseClassKt.class
-  out/production/module/baz/UseFunKt.class
-End of files
-Compiling files:
-  src/bar/a.kt
-  src/useClass.kt
-  src/useFun.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt
deleted file mode 100644
index 8bb46f273dfe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-class Foo
-
-fun bar() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt
deleted file mode 100644
index b40e183d8fb7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-private fun dummy() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt
deleted file mode 100644
index 5134f9a405f9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package baz
-
-import foo.*
-import bar.*
-
-fun useClass() {
-    Foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt
deleted file mode 100644
index 92512578ad11..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package baz
-
-import foo.*
-import bar.*
-
-fun useFun() {
-    bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new
deleted file mode 100644
index 0394ed4179b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package baz
-
-class Foo
-
-fun bar() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log
deleted file mode 100644
index 18e79a7f2784..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log
+++ /dev/null
@@ -1,18 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/baz/AKt.class
-  out/production/module/baz/Foo.class
-End of files
-Cleaning output files:
-  out/production/module/baz/UseClassKt.class
-  out/production/module/baz/UseFunKt.class
-End of files
-Compiling files:
-  src/bar/a.kt
-  src/useClass.kt
-  src/useFun.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt
deleted file mode 100644
index 0394ed4179b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package baz
-
-class Foo
-
-fun bar() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
deleted file mode 100644
index 3d440011e9bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/baz/AKt.class
-  out/production/module/baz/Foo.class
-End of files
-Compiling files:
-  src/bar/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log
deleted file mode 100644
index d74999d206d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/js-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-    src/bar/a.kt
-    src/useClass.kt
-    src/useFun.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt
deleted file mode 100644
index 8418cee66647..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package baz
-
-fun useClass() {
-    Foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt
deleted file mode 100644
index d56ad84e8ec8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package baz
-
-fun useFun() {
-    bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt
deleted file mode 100644
index 2bd705934bc8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun a1() = ":)"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new
deleted file mode 100644
index 4e46bd9087fa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package a
-
-fun a2() = ":))"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt
deleted file mode 100644
index 21999b4bfe68..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package b
-
-fun b1() = ":("
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt
deleted file mode 100644
index d2f49a90033a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package b
-
-fun b2() = ":(("
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/build.log
deleted file mode 100644
index e4510f053f89..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/multiplePackagesModified/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/b/B2Kt.class
-End of files
-Compiling files:
-  src/a2.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/build.log
deleted file mode 100644
index 261ecf147523..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Object.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt
deleted file mode 100644
index 18ba78875d7c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-object Object {
-    const val CONST = "old"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new
deleted file mode 100644
index 3c94cbcc28ba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-object Object {
-    const val CONST = "new"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/usage.kt
deleted file mode 100644
index d35df24ec9fb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/objectConstantChanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(Object.CONST + Object.CONST)
-class Usage
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt
deleted file mode 100644
index a8ac38430eb5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package klass
-
-class Klass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt
deleted file mode 100644
index 3682a9d29131..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-import klass.*
-
-fun a(klass: Klass) {
-    b(klass)
-    println(":)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/b.kt
deleted file mode 100644
index 0d41f8e3417b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/b.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-import klass.*
-
-fun b(klass: Klass) {
-    a(klass)
-    println(":)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/build.log
deleted file mode 100644
index d636aedc54e7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/ourClassReferenced/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/klass/Klass.class
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/Klass.kt
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/build.log
deleted file mode 100644
index 2f4d6edd44c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/DummyKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/dummy.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/dummy.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloaded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloaded.kt
deleted file mode 100644
index fb56a46b7a33..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloaded.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun overloaded(x: Int) {}
-fun overloaded(s: String) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt
deleted file mode 100644
index ed0031e1a7ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/overloadedInline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-inline fun overloadedInline() {
-    overloaded("overloadedInline")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt
deleted file mode 100644
index d7def58140a1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloaded.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useOverloaded() {
-    overloaded("useOverloadedInline")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt
deleted file mode 100644
index df6229de93fd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/overloadInlined/useOverloadedInline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useOverloadedInline()  {
-    overloadedInline()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/build.log
deleted file mode 100644
index d140a2774bb2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt
deleted file mode 100644
index cbc9ae867172..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-// Old and new constant values are different, but their hashes are the same
-const val CONST = "BF"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new
deleted file mode 100644
index 5d4d205f5a10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-// Old and new constant values are different, but their hashes are the same
-const val CONST = "Ae"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/usage.kt
deleted file mode 100644
index 5ce8a2a89f70..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageConstantChanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(CONST + CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/b.kt.new
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/b.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/build.log
deleted file mode 100644
index 8203a205c741..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileAdded/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new
deleted file mode 100644
index 7a4e3e2d245c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package newName
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/build.log
deleted file mode 100644
index 9c5c0846c6bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedPackage/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1
deleted file mode 100644
index a36b6841040e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "aa"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log
deleted file mode 100644
index da15fc4665c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/build.log
deleted file mode 100644
index 0bae08720976..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/other/OtherKt.class
-End of files
-Compiling files:
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt
deleted file mode 100644
index 0444e2a6b41f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun imInOtherPackage() = ":)"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2
deleted file mode 100644
index 7d0038f7762a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun imInOtherPackage() = ":))"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1
deleted file mode 100644
index a36b6841040e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "aa"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2
deleted file mode 100644
index 0099182b31f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "bb"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log
deleted file mode 100644
index 792c4cff026d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log
+++ /dev/null
@@ -1,35 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #3 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log
deleted file mode 100644
index 5a7cd69239ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt
deleted file mode 100644
index 9523df0da2c1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-val property = ":)"
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function" + property)
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt
deleted file mode 100644
index 9c34b3337b99..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package other
-
-val property = ":)"
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function" + property)
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt
deleted file mode 100644
index e5bb1ff52132..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
deleted file mode 100644
index 5a7cd69239ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt
deleted file mode 100644
index fb5e59f5432e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt
deleted file mode 100644
index ee2e62163652..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log
deleted file mode 100644
index 345e3083078b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/PkgKt.class
-End of files
-Compiling files:
-  src/pkg.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt
deleted file mode 100644
index 127853531dc2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun commonFun() {}
-
-private val deletedVal: Int = 20
-
-private fun deletedFun(): Int = 10
-
-private fun changedFun(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new
deleted file mode 100644
index 97e4d7778018..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-fun commonFun() {}
-
-private val addedVal: Int = 20
-
-private fun addedFun(): Int = 50
-
-private fun changedFun(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt
deleted file mode 100644
index 137dc6be5535..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Usage {
-    fun f() {
-        commonFun()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/build.log
deleted file mode 100644
index 8071b7867064..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreated/build.log
+++ /dev/null
@@ -1,18 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1
deleted file mode 100644
index 9d39f81713ea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-package test2
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log
deleted file mode 100644
index 31068d6310a6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt
deleted file mode 100644
index 30ca24b55763..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/a.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt
deleted file mode 100644
index 5c782f47a259..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/b.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/build.log
deleted file mode 100644
index b44cdc0a85f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Cleaning output files:
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/packageRemoved/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log
deleted file mode 100644
index d03762157b6c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log
+++ /dev/null
@@ -1,45 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt
deleted file mode 100644
index 4a08b109ea22..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Any) {
-    println("f(x: Any)")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1
deleted file mode 100644
index 61c36892bc51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Any, y: String = "D") {
-    println("f(x: Any, $y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2
deleted file mode 100644
index e68c4f92ca91..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Any = "", y: String = "D") {
-    println("f(x: Any, $y)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt
deleted file mode 100644
index 73e68e1b5e97..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault1() {
-    f(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log
deleted file mode 100644
index 1594b2d4bacc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useDefault.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UseDefaultKt.class
-End of files
-Compiling files:
-  src/useDefault.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt
deleted file mode 100644
index 727dcd2fd25b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun f(x: Any, y: String = "D") {
-    println("f(x: Any, $y)")
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1
deleted file mode 100644
index 797e0254b27b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(x: Any) {
-    println("f(x: Any)")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt
deleted file mode 100644
index 73e68e1b5e97..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun useDefault1() {
-    f(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/build.log
deleted file mode 100644
index 8e7eba934482..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ConstKt.class
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-  out/production/module/test/Obj.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt
deleted file mode 100644
index 9ab04e28affb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-const val CONST = "foo"
-
-class Klass {
-    companion object {
-        private val CHANGED = "old"
-        const public val UNCHANGED = 100
-    }
-}
-
-object Obj : Any() {
-    private val CHANGED = "old:Obj"
-    public val UNCHANGED = 200
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new
deleted file mode 100644
index 83f620f0760d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new
+++ /dev/null
@@ -1,15 +0,0 @@
-package test
-
-const val CONST = "foo"
-
-class Klass {
-    companion object {
-        private val CHANGED = "new"
-        const public val UNCHANGED = 100
-    }
-}
-
-object Obj : Any() {
-    private val CHANGED = "new:Obj"
-    public val UNCHANGED = 200
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt
deleted file mode 100644
index 0804182a1b58..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(CONST + Klass.UNCHANGED)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new
deleted file mode 100644
index 723e5e37f855..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private fun meth2() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodAdded/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt
deleted file mode 100644
index 723e5e37f855..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private fun meth2() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt
deleted file mode 100644
index 3f088c6061b0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private fun meth2(x: Int): Unit {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new
deleted file mode 100644
index e24e8d0cd8d0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private fun meth2(x: String, y: Int): Int = 10
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new
deleted file mode 100644
index ab54ddbefc2b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private constructor(x: Int) : this() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt
deleted file mode 100644
index ab54ddbefc2b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private constructor(x: Int) : this() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt
deleted file mode 100644
index 0ff30762c8db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new
deleted file mode 100644
index d01d489eb330..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x: Int
-    get() = 200
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new
deleted file mode 100644
index 0ff30762c8db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValAdded/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt
deleted file mode 100644
index 0ff30762c8db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValDeleted/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt
deleted file mode 100644
index 0ff30762c8db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new
deleted file mode 100644
index 65e28f46525b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private val x: String = "X"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new
deleted file mode 100644
index d561df317543..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private var x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarAdded/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt
deleted file mode 100644
index d561df317543..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private var x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new
deleted file mode 100644
index 0e3beda7f350..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarDeleted/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt
deleted file mode 100644
index d561df317543..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private var x = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new
deleted file mode 100644
index b0a5c26784bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA() {
-    public fun meth1() {}
-    private var x: String = "X"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt
deleted file mode 100644
index 5ba6a9572bb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-public object Usage {
-    public fun f() {
-        ClassA().meth1()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log
deleted file mode 100644
index d8e58d775555..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build-with-scope-expansion.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/prop1.kt
-  src/prop2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting declarations: public val prop1: Int, public val prop1: Int
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build.log
deleted file mode 100644
index 144f50805eae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Prop2Kt.class
-End of files
-Compiling files:
-  src/prop2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Conflicting declarations: public val prop1: Int, public val prop1: Int
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt
deleted file mode 100644
index c80484f5633c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/dummy.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun dummy() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt
deleted file mode 100644
index 1c855edd0acc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val prop1 = 1
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt
deleted file mode 100644
index 461b5d22cafa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val prop2 = 2
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new
deleted file mode 100644
index 2f68bba3b004..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-val prop1 = 1
-val prop2 = 2
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
deleted file mode 100644
index 157ba41596ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test2/Prop2Kt.class
-End of files
-Compiling files:
-  src/prop2.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
deleted file mode 100644
index 046382d5cc4e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-var property = 1
-    private set
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
deleted file mode 100644
index 5378c878b137..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test2
-import test.*
-
-fun dummy() {
-    if (true) 1 else property
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
deleted file mode 100644
index 7060f03a59b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun dummy() {
-    if (true) 2 else property
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt
deleted file mode 100644
index 2f7dd0ca36f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-class A {
-    companion object {
-        val bar = 1
-        fun foo() {}
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1
deleted file mode 100644
index 78fd9a124998..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-package foo
-
-class A {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2
deleted file mode 100644
index 2f7dd0ca36f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-class A {
-    companion object {
-        val bar = 1
-        fun foo() {}
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log
deleted file mode 100644
index 4e6bb525f47a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log
+++ /dev/null
@@ -1,48 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/A.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A$Companion.class
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useA.kt
-  src/useAbar.kt
-  src/useAfoo.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/use/UseAKt.class
-  out/production/module/use/UseAbarKt.class
-  out/production/module/use/UseAfooKt.class
-End of files
-Compiling files:
-  src/useA.kt
-  src/useAbar.kt
-  src/useAfoo.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: bar
-Unresolved reference: foo
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/useA.kt
-  src/useAbar.kt
-  src/useAfoo.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt
deleted file mode 100644
index 9f7e7f2a233a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt
deleted file mode 100644
index 3b225c94df4d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAbar() {
-    A.bar
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt
deleted file mode 100644
index ab54273a874f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfoo() {
-    A.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt
deleted file mode 100644
index 2f7dd0ca36f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-class A {
-    companion object {
-        val bar = 1
-        fun foo() {}
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1
deleted file mode 100644
index 78fd9a124998..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-package foo
-
-class A {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2
deleted file mode 100644
index 2f7dd0ca36f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-class A {
-    companion object {
-        val bar = 1
-        fun foo() {}
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
deleted file mode 100644
index f8efb416c6e2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log
+++ /dev/null
@@ -1,49 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/getACompanion.kt
-  src/getACompanionShort.kt
-  src/useACompanionImplicitly.kt
-  src/useACompanionShortImplicitly.kt
-  src/useAbarWithImplicitReceiver.kt
-  src/useAfooWithImplicitReceiver.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A$Companion.class
-  out/production/module/foo/A.class
-  out/production/module/use/GetACompanionKt.class
-  out/production/module/use/GetACompanionShortKt.class
-  out/production/module/use/UseACompanionImplicitlyKt.class
-  out/production/module/use/UseACompanionShortImplicitlyKt.class
-  out/production/module/use/UseAbarWithImplicitReceiverKt.class
-  out/production/module/use/UseAfooWithImplicitReceiverKt.class
-End of files
-Compiling files:
-  src/A.kt
-  src/getACompanion.kt
-  src/getACompanionShort.kt
-  src/useACompanionImplicitly.kt
-  src/useACompanionShortImplicitly.kt
-  src/useAbarWithImplicitReceiver.kt
-  src/useAfooWithImplicitReceiver.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: Companion
-Classifier 'A' does not have a companion object, and thus must be initialized here
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/getACompanion.kt
-  src/getACompanionShort.kt
-  src/useACompanionImplicitly.kt
-  src/useACompanionShortImplicitly.kt
-  src/useAbarWithImplicitReceiver.kt
-  src/useAfooWithImplicitReceiver.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt
deleted file mode 100644
index 07be111bdc82..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun getACompanion() = A.Companion
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt
deleted file mode 100644
index c48c918a127d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package use
-
-import foo.*
-
-fun getACompanionShort() = A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt
deleted file mode 100644
index aab5128d6475..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useACompanionImplicitly() {
-    getACompanion()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt
deleted file mode 100644
index fa3bd90b5a63..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useACompanionShortImplicitly() {
-    getACompanionShort()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt
deleted file mode 100644
index 53ef3d00db9b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAbarWithImplicitReceiver() {
-    getACompanionShort().bar
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt
deleted file mode 100644
index 2326586ccf0b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useAfooWithImplicitReceiver() {
-    getACompanion().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt
deleted file mode 100644
index c31fc881e2be..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/A.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/build.log
deleted file mode 100644
index 1c0af2098a43..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Marked as dirty by Kotlin:
-  src/funA.kt
-  src/useA.kt
-Cleaning output files:
-  out/production/module/foo/FunAKt.class
-  out/production/module/use/UseAKt.class
-End of files
-Compiling files:
-  src/funA.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/funA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/funA.kt
deleted file mode 100644
index 7ac231ab2e01..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/funA.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package foo
-
-fun A(a: Int = 0) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/useA.kt
deleted file mode 100644
index 9f7e7f2a233a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClass/useA.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt
deleted file mode 100644
index 83d15dc739b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt
+++ /dev/null
@@ -1 +0,0 @@
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
deleted file mode 100644
index 4686e037381e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Marked as dirty by Kotlin:
-  src/funA.kt
-  src/useA.kt
-Cleaning output files:
-  out/production/module/FunAKt.class
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/funA.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt
deleted file mode 100644
index 95dc410cc522..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun A(a: Int = 0) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt
deleted file mode 100644
index 8dfb7d1395eb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log
deleted file mode 100644
index bd46dda7b7bf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/Foo2Kt.class
-End of files
-Cleaning output files:
-  out/production/module/use/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Marked as dirty by Kotlin:
-  src/foo1.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/Foo1Kt.class
-End of files
-Compiling files:
-  src/foo1.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt
deleted file mode 100644
index bd7697f40356..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Any) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt
deleted file mode 100644
index ac48e24c9e5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt
deleted file mode 100644
index e9dbe9f4ac12..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    f(1)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
deleted file mode 100644
index 6a5080369a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package a
-
-class Outer {
-    inner class B(x: String)
-
-    @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-    typealias A1 = B
-
-    @Suppress("TOPLEVEL_TYPEALIASES_ONLY")
-    private typealias A2 = B
-
-    fun A1(x: Any) = x
-    fun A2(x: Any) = x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
deleted file mode 100644
index 7563b0f4d1d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package a
-
-class Outer {
-    inner class B(x: String)
-
-    fun A1(x: Any) = x
-    fun A2(x: Any) = x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
deleted file mode 100644
index d61b70bda0cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun bar() {
-    a.Outer().A1("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
deleted file mode 100644
index c06dc193b88c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun baz() {
-    a.Outer().A2("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
deleted file mode 100644
index 2b216fb7c017..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/a/Outer$B.class
-  out/production/module/a/Outer.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a1Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/A1UsageKt.class
-End of files
-Compiling files:
-  src/a1Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
deleted file mode 100644
index 8c7438ac9216..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package a
-
-class B(x: String)
-
-typealias A1 = B
-private typealias A2 = B
-
-fun A1(x: Any) = x
-fun A2(x: Any) = x
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
deleted file mode 100644
index e7bbb5080ec9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package a
-
-class B(x: String)
-
-fun A1(x: Any) = x
-fun A2(x: Any) = x
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
deleted file mode 100644
index 78523ab3a177..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun bar() {
-    a.A1("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
deleted file mode 100644
index eaf8e2a62476..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package usage
-
-fun baz() {
-    a.A2("")
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
deleted file mode 100644
index 4f5133e9753a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/a/AKt.class
-  out/production/module/a/B.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a1Usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/A1UsageKt.class
-End of files
-Compiling files:
-  src/a1Usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/build.log
deleted file mode 100644
index d92fc98392a8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Bar.class
-  out/production/module/test/UnusedKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt
deleted file mode 100644
index 41afa7127cec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {}
-
-class Bar() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/removeUnusedFile/unused.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt
deleted file mode 100644
index c31fc881e2be..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class A
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt.new
deleted file mode 100644
index f1e47bf2be36..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/A.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/build.log
deleted file mode 100644
index 5705976c3040..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/build.log
+++ /dev/null
@@ -1,30 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/funs.kt
-  src/useA.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-  out/production/module/foo/FunsKt.class
-  out/production/module/use/UseAKt.class
-End of files
-Compiling files:
-  src/A.kt
-  src/funs.kt
-  src/useA.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useB.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/use/UseBKt.class
-End of files
-Compiling files:
-  src/useB.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/funs.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/funs.kt
deleted file mode 100644
index fb3931989a7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/funs.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package foo
-
-fun A(a: Int = 1) {}
-fun B(a: Int = 1) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/other.kt
deleted file mode 100644
index d3689e2ea8bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useA.kt
deleted file mode 100644
index 9f7e7f2a233a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useA.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useA() {
-    A()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useB.kt
deleted file mode 100644
index cd47d4827efd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameClass/useB.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useB() {
-    B()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log
deleted file mode 100644
index e2768cbeca8b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log
+++ /dev/null
@@ -1,26 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/Foo2Kt.class
-End of files
-Cleaning output files:
-  out/production/module/use/UseFKt.class
-End of files
-Compiling files:
-  src/foo3.kt
-  src/useF.kt
-End of files
-Marked as dirty by Kotlin:
-  src/foo1.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/Foo1Kt.class
-End of files
-Compiling files:
-  src/foo1.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt
deleted file mode 100644
index 64145697fef9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun g(a: Any) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt
deleted file mode 100644
index bd7697f40356..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Any) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt
deleted file mode 100644
index ac48e24c9e5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new
deleted file mode 100644
index ac48e24c9e5f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun f(a: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt
deleted file mode 100644
index 1d758703f95d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun f() {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt
deleted file mode 100644
index d88a974a7752..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useF() {
-    f(1)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt
deleted file mode 100644
index 541bd66e55b6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package use
-
-import foo.*
-
-fun useG() {
-    g(1)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/build.log
deleted file mode 100644
index bd047404e083..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt
deleted file mode 100644
index 8387e08ec935..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun foo() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new
deleted file mode 100644
index 059cb5d8478e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun foo(): String = ":)"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/usage.kt
deleted file mode 100644
index ce711cd81b50..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/returnTypeChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage() {
-    foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt
deleted file mode 100644
index e41a06d2875c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface A : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt
deleted file mode 100644
index 324aaa75684e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new
deleted file mode 100644
index cdc33c843df3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt
deleted file mode 100644
index 4e5675b150a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-sealed interface Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt
deleted file mode 100644
index 56ea44cbedd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log
deleted file mode 100644
index 2b7405353a60..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log
+++ /dev/null
@@ -1,28 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/B.class
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-  out/production/module/test/B.class
-  out/production/module/test/Base.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute
deleted file mode 100644
index 45f4097dd428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute
+++ /dev/null
@@ -1 +0,0 @@
-IC of sealed interfaces are not supported in JS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt
deleted file mode 100644
index 755dfbd73d43..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface С
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt
deleted file mode 100644
index e41a06d2875c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface A : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt
deleted file mode 100644
index cdc33c843df3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt
deleted file mode 100644
index 4e5675b150a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-sealed interface Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new
deleted file mode 100644
index da276aa99da6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface C : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt
deleted file mode 100644
index 56ea44cbedd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log
deleted file mode 100644
index 59554ef9cfa0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log
+++ /dev/null
@@ -1,27 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/C.kt
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-  src/C.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-  out/production/module/test/B.class
-  out/production/module/test/Base.class
-  out/production/module/test/C.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-  src/C.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute
deleted file mode 100644
index 45f4097dd428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute
+++ /dev/null
@@ -1 +0,0 @@
-IC of sealed interfaces are not supported in JS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt
deleted file mode 100644
index e41a06d2875c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface A : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt
deleted file mode 100644
index cdc33c843df3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new
deleted file mode 100644
index 25bf4d005ba8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-interface B
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt
deleted file mode 100644
index 4e5675b150a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-sealed interface Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt
deleted file mode 100644
index f2533e119787..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class C {
-    lateinit var base: Base
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt
deleted file mode 100644
index 56ea44cbedd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log
deleted file mode 100644
index 379d4b734e19..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log
+++ /dev/null
@@ -1,39 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/B.class
-End of files
-Compiling files:
-  src/B.kt
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-  out/production/module/test/B.class
-  out/production/module/test/Base.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-End of files
-Marked as dirty by Kotlin:
-  src/BaseUsage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/C.class
-End of files
-Compiling files:
-  src/BaseUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute
deleted file mode 100644
index 45f4097dd428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute
+++ /dev/null
@@ -1 +0,0 @@
-IC of sealed interfaces are not supported in JS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt
deleted file mode 100644
index e41a06d2875c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface A : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt
deleted file mode 100644
index cdc33c843df3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt
deleted file mode 100644
index 4e5675b150a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-sealed interface Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt
deleted file mode 100644
index f2533e119787..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class C {
-    lateinit var base: Base
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt
deleted file mode 100644
index 56ea44cbedd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log
deleted file mode 100644
index cb874b1df7ba..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log
+++ /dev/null
@@ -1,35 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/B.class
-End of files
-Compiling files:
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/Base.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-  out/production/module/test/Base.class
-End of files
-Compiling files:
-  src/A.kt
-  src/Base.kt
-End of files
-Marked as dirty by Kotlin:
-  src/BaseUsage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/C.class
-End of files
-Compiling files:
-  src/BaseUsage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute
deleted file mode 100644
index 45f4097dd428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute
+++ /dev/null
@@ -1 +0,0 @@
-IC of sealed interfaces are not supported in JS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt
deleted file mode 100644
index e41a06d2875c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface A : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt
deleted file mode 100644
index cdc33c843df3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface B : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt
deleted file mode 100644
index 4e5675b150a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-sealed interface Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
deleted file mode 100644
index da276aa99da6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-interface C : Base
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
deleted file mode 100644
index 71237657cd94..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class D {
-    lateinit var x: Base
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt
deleted file mode 100644
index 7a1c3583390a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-class E {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt
deleted file mode 100644
index 56ea44cbedd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt
+++ /dev/null
@@ -1 +0,0 @@
--XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log
deleted file mode 100644
index d1581952b1f9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log
+++ /dev/null
@@ -1,38 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/C.kt
-End of files
-Marked as dirty by Kotlin:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-  src/C.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-  out/production/module/test/B.class
-  out/production/module/test/Base.class
-  out/production/module/test/C.class
-End of files
-Compiling files:
-  src/A.kt
-  src/B.kt
-  src/Base.kt
-  src/C.kt
-End of files
-Marked as dirty by Kotlin:
-  src/D.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/D.class
-End of files
-Compiling files:
-  src/D.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute
deleted file mode 100644
index 45f4097dd428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute
+++ /dev/null
@@ -1 +0,0 @@
-IC of sealed interfaces are not supported in JS
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt
deleted file mode 100644
index 32814adc2ef8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/Err.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class Err constructor(msg: String?, unused: Any?) {
-    constructor() : this(null, null)
-    constructor(msg: String) : this(msg, null)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log
deleted file mode 100644
index 2f4d6edd44c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/DummyKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/dummy.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt
deleted file mode 100644
index e63a8fa372c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/createErr.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-inline fun createErr() {
-    Err("createErr")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/dummy.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt
deleted file mode 100644
index b8650c4ca7c4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/secondaryConstructorInlined/useCreateErr.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useCreateErr()  {
-    createErr()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt
deleted file mode 100644
index 862629bf67c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package test
-class Bar
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt
deleted file mode 100644
index d40f04709d32..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-class Foo {
-    fun f() {
-        Bar()
-    }
-
-    class Boo
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/build.log
deleted file mode 100644
index 16947c0b61d5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/simpleClassDependency/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Foo$Boo.class
-  out/production/module/test/Foo.class
-End of files
-Compiling files:
-  src/Foo.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt
deleted file mode 100644
index 058137655b81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new
deleted file mode 100644
index eb3b7b757d29..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package bar
-
-fun a() = "a"
-fun aa() = "aa"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
deleted file mode 100644
index 9758c44ea24d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/soleFileChangesPackage/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/build.log
deleted file mode 100644
index 2acccf6a6be2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/outer/nested/NestedKt$main$1.class
-  out/production/module/outer/nested/NestedKt.class
-End of files
-Compiling files:
-  src/nested.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt
deleted file mode 100644
index 83ce65bc9df2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package outer.nested
-
-import outer.f
-
-fun g() {
-}
-
-fun main(args: Array<String>) {
-    f { }
-    g()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/nested.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/outer.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/outer.kt
deleted file mode 100644
index 83ddfc54f1e0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/subpackage/outer.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package outer
-
-fun f(c: () -> Unit) {
-}
-
-fun <T> f(c: () -> T): String = ""
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt
deleted file mode 100644
index c43e7a6a7d91..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package test
-
-class Counter {
-    suspend fun one() {}
-    suspend fun two() {}
-    suspend fun both() {
-        one()
-        two()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/build.log
deleted file mode 100644
index ce955a3768c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/OtherKt.class
-End of files
-Compiling files:
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt
deleted file mode 100644
index 092462c70e07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun dummyFunction() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log
deleted file mode 100644
index 0aba103dd32b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt
deleted file mode 100644
index 8387e08ec935..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun foo() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new
deleted file mode 100644
index 9c3c1518d9e3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-    println("body is changed, but it doesn't matter, we won't rebuild dependencies")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt
deleted file mode 100644
index ce711cd81b50..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage() {
-    foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt
deleted file mode 100644
index 82c072323543..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-fun foo() {
-    bar(5)
-    baz()
-}
-
-fun baz() {
-}
-
-val prop1 = ""
-val prop2 = prop1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new
deleted file mode 100644
index d03b1414762d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new
+++ /dev/null
@@ -1,12 +0,0 @@
-package test
-
-fun foo() {
-    bar(4)
-    baz()
-}
-
-fun baz() {
-}
-
-val prop1 = ""
-val prop2 = prop1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt
deleted file mode 100644
index 8505df45d7d6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package test
-
-fun bar(i: Int): String {
-    simpleVar = ":) " + simpleVar
-
-    return "$i   ${quux()}   $i"
-}
-
-fun quux(): String {
-    return "quux"
-}
-
-var simpleVar = prop1
-
-var fieldlessVar: String
-    get() = ""
-    set(value) {}
-
-@Deprecated("")
-val fieldlessValWithAnnotation: String
-    get() = ""
-
-var delegated: String by kotlin.properties.Delegates.notNull()
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log
deleted file mode 100644
index eef6764ff167..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
deleted file mode 100644
index 30638dfb226f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'foo': it is private in file
-
-================ Step #2 =================
-
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
deleted file mode 100644
index 5715a620cede..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-private fun foo() = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
deleted file mode 100644
index 6bdc11105c7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun usage() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
deleted file mode 100644
index e62a20dd9342..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun usage() {
-    println(foo())
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
deleted file mode 100644
index 6bdc11105c7d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun usage() {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
deleted file mode 100644
index 10639a549f66..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Trait$Companion.class
-  out/production/module/test/Trait.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Usage.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
deleted file mode 100644
index 0fe79d3540c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-interface Trait {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
deleted file mode 100644
index 67d312249e96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-interface Trait {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt
deleted file mode 100644
index 83d2b3b25256..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-@Deprecated(Trait.CONST + Trait.CONST)
-class Usage
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt
deleted file mode 100644
index b4f360711311..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class A() {
-    val x: Int? = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new
deleted file mode 100644
index eb3e9b669b57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class A() {
-    val x: Int? = 100
-        get() = field?.inc()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
deleted file mode 100644
index 3a6140adab1a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt
deleted file mode 100644
index a078d191b0b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-public fun usage() {
-    val a = A()
-    if (a.x != null) {
-        a.x.dec()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt
deleted file mode 100644
index eb3e9b669b57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-class A() {
-    val x: Int? = 100
-        get() = field?.inc()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2
deleted file mode 100644
index b4f360711311..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class A() {
-    val x: Int? = 100
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
deleted file mode 100644
index ba582b860912..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/test/A.class
-End of files
-Compiling files:
-  src/A.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt
deleted file mode 100644
index e7d40a8d067c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-public fun usage() {
-    val a = A()
-    if (a.x != null) {
-//        a.x.dec()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1
deleted file mode 100644
index a078d191b0b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-public fun usage() {
-    val a = A()
-    if (a.x != null) {
-        a.x.dec()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
deleted file mode 100644
index f613d2ee4ff9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/Foo.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-interface Foo {
-    val value: TypeAlias
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
deleted file mode 100644
index 4ce00aeb8f7f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-class FooImpl : Foo {
-    override val value: TypeAlias
-        get() = "0"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
deleted file mode 100644
index 9f9ec1932b82..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/FooImpl.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-class FooImpl : Foo {
-    override val value: TypeAlias
-        get() = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
deleted file mode 100644
index e22dbc2bfd62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt
+++ /dev/null
@@ -1 +0,0 @@
-typealias TypeAlias = String
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
deleted file mode 100644
index b40d921b9ec4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/TypeAlias.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-typealias TypeAlias = Int
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
deleted file mode 100644
index 52215592293c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/build.log
+++ /dev/null
@@ -1,9 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Foo.kt
-  src/FooImpl.kt
-  src/TypeAlias.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/changeTypeAliasAndUsage/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
deleted file mode 100644
index ddc96ccbc5c6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-open class A {
-    protected open fun foo(): Int = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
deleted file mode 100644
index 54d474ee2119..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/a.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-open class A {
-    open fun foo(): Int = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
deleted file mode 100644
index 00418a633c96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/b.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-open class B : A() {
-    override fun foo(): Int = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
deleted file mode 100644
index 3dda9a306e1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/build.log
+++ /dev/null
@@ -1,9 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/a.kt
-  src/b.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
deleted file mode 100644
index 2ff821a2d527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() = "other"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
deleted file mode 100644
index cdc32d3de7fe..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
deleted file mode 100644
index 8e6c3e1570bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild/usage.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    B().foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/X.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/X.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/X.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
deleted file mode 100644
index a802b656773d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class TheClass {
-    public void doStuff() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
deleted file mode 100644
index 0e11cbbd2845..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-public class TheClass {
-    public fun doStuff() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
deleted file mode 100644
index c4f889667f3a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class Usage {
-    void usage() {
-        new TheClass().doStuff();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
deleted file mode 100644
index 15d93beab437..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/TheClass.class
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Usage.class
-  out/production/module/UsageInKotlinKt.class
-End of files
-Compiling files:
-  src/TheClass.kt
-  src/usageInKotlin.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/Usage.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt
deleted file mode 100644
index 64cd1bf23ad1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usage() {
-    TheClass().doStuff()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java
deleted file mode 100644
index 4a55c67d4ac9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java
+++ /dev/null
@@ -1,4 +0,0 @@
-class Foo {
-    void bar() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2
deleted file mode 100644
index 4a55c67d4ac9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2
+++ /dev/null
@@ -1,4 +0,0 @@
-class Foo {
-    void bar() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1
deleted file mode 100644
index fd3049a57c62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-class Foo {
-    fun baz() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
deleted file mode 100644
index 0b6892881116..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log
+++ /dev/null
@@ -1,35 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Foo.class
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/Foo.kt
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Foo.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Cleaning output files:
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/Foo.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt
deleted file mode 100644
index 71ee477874c8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    Foo().bar()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1
deleted file mode 100644
index ad3a299f5978..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    Foo().baz()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2
deleted file mode 100644
index f66de4d04e07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-//    Foo().bar()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java
deleted file mode 100644
index e53046270c96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class TheClass {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1
deleted file mode 100644
index d02d5373a870..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1
+++ /dev/null
@@ -1 +0,0 @@
-public class TheClass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log
deleted file mode 100644
index 00b0e38e94f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/TheClass.class
-End of files
-Compiling files:
-  src/TheClass.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/TheClass.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log
deleted file mode 100644
index 614e199c270c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/gradle-build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/TheClass.kt
-  src/other.kt
-End of files
-Exit code: OK
-
-================ Step #2 =================
-
-Compiling files:
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt
deleted file mode 100644
index 567945cc9b5a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
deleted file mode 100644
index a802b656773d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new
+++ /dev/null
@@ -1,5 +0,0 @@
-public class TheClass {
-    public void doStuff() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
deleted file mode 100644
index 0e11cbbd2845..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-public class TheClass {
-    public fun doStuff() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
deleted file mode 100644
index c4f889667f3a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class Usage {
-    void usage() {
-        new TheClass().doStuff();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
deleted file mode 100644
index ce3183f7f70d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log
+++ /dev/null
@@ -1,30 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/TheClass.class
-End of files
-Marked as dirty by Kotlin:
-  src/usageInKotlin.kt
-Cleaning output files:
-  out/production/module/Usage.class
-  out/production/module/UsageInKotlinKt.class
-End of files
-Compiling files:
-  src/usageInKotlin.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/TheClass.java
-  src/Usage.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageInKotlinKt.class
-End of files
-Compiling files:
-  src/usageInKotlin.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt
deleted file mode 100644
index 64cd1bf23ad1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usage() {
-    TheClass().doStuff()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java
deleted file mode 100644
index 2fb012bd6ff3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public String stringField;
-    public int intField;
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new
deleted file mode 100644
index aef7f23f0b78..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/JavaClass.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public CharSequence stringField;
-    public int intField;
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt
deleted file mode 100644
index 0775e74e3440..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().intField
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt
deleted file mode 100644
index 6ab667aca2eb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeFieldType/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().stringField
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java
deleted file mode 100644
index 15f4844a8da7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public static void foo() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new
deleted file mode 100644
index 78acfa5f44bf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JavaClass {
-    public static String foo() {
-        return ":)";
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log
deleted file mode 100644
index 1b429defcb64..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt
deleted file mode 100644
index 8aa421dfc378..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main(args: Array<String>) {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java
deleted file mode 100644
index 3fb1d4bce6ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass implements KotlinInterface {
-    public CharSequence getX() { return ""; }
-    public int getY() { return 1; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new
deleted file mode 100644
index b0f7c82af7b3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/JavaClass.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass implements KotlinInterface {
-    public String getX() { return ""; }
-    public int getY() { return 1; }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt
deleted file mode 100644
index de997e81c851..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/KotlinInterface.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-interface KotlinInterface {
-    val x: CharSequence
-    val y: Int
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt
deleted file mode 100644
index 816c2d509b98..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().y
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt
deleted file mode 100644
index 32b02fc7c9ec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().x
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java
deleted file mode 100644
index 55262a600a87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new
deleted file mode 100644
index 8b1a8ec8c441..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new
+++ /dev/null
@@ -1,8 +0,0 @@
-public class JavaClass {
-    public String foo() {
-        return "";
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt
deleted file mode 100644
index 30fa9af22dec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt
deleted file mode 100644
index 4195e7d27c9b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java
deleted file mode 100644
index 55262a600a87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new
deleted file mode 100644
index 4ffae8c6aff5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log
deleted file mode 100644
index 0e831894bf30..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log
deleted file mode 100644
index 91d6b204d110..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt
deleted file mode 100644
index 30fa9af22dec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt
deleted file mode 100644
index 4195e7d27c9b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java
deleted file mode 100644
index 55262a600a87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new
deleted file mode 100644
index 4ffae8c6aff5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log
deleted file mode 100644
index 9288d8290539..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/second/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot access 'foo': it is package-private in 'JavaClass'
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt
deleted file mode 100644
index ac987ea20eb8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package first
-
-import JavaClass
-
-fun main(args: Array<String>) {
-    JavaClass().bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt
deleted file mode 100644
index a81208855806..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package second
-
-import JavaClass
-
-fun main(args: Array<String>) {
-    JavaClass().foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java
deleted file mode 100644
index ef47ee18a36b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public static void foo() {
-    }
-
-    public static void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new
deleted file mode 100644
index 85b72351fb8e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/JavaClass.java.new
+++ /dev/null
@@ -1,8 +0,0 @@
-public class JavaClass {
-    public static String foo() {
-        return "";
-    }
-
-    public static void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log
deleted file mode 100644
index 6acfcd2c4808..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt
deleted file mode 100644
index bc792c0d8e0b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass.bar()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt
deleted file mode 100644
index 43c9b8575bcf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
deleted file mode 100644
index 82fe695ad2c4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        public class InnerInner {
-            public static final String CONST = "A";
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
deleted file mode 100644
index fd1f9078bd2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        public class InnerInner {
-            public static final String CONST = "B";
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
deleted file mode 100644
index 551eb3388b1f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass$Inner$InnerInner.class
-  out/production/module/JavaClass$Inner.class
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
deleted file mode 100644
index 17fbe5c28085..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import JavaClass.Inner.InnerInner.CONST
-
-fun main() {
-    val myKotlinConst = CONST
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
deleted file mode 100644
index 888f27db4e3f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JavaClass {
-    public static final String CONST = "A";
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
deleted file mode 100644
index 1b429defcb64..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
deleted file mode 100644
index 28cbf027dc60..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-import JavaClass.CONST
-
-fun main() {
-    val myKotlinConst = CONST
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
deleted file mode 100644
index a5b25884ea62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public enum Enum {
-    A,
-    B
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
deleted file mode 100644
index dc41c6883d8a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-public enum Enum {
-    A,
-    B,
-    C
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
deleted file mode 100644
index f9695c15cb51..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Enum.java
-End of files
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt$WhenMappings.class
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
deleted file mode 100644
index 2845b19351c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-import java.util.Random
-
-fun getRandomEnumEntry() =
-        with (Enum.values()) {
-            get(Random().nextInt(size))
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log
deleted file mode 100644
index 739c085f5d96..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Enum.java
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead
-
-================ Step #2 =================
-
-Compiling files:
-  src/Enum.java
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
deleted file mode 100644
index 14d2aa5be07b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
deleted file mode 100644
index d64d3769328f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2
+++ /dev/null
@@ -1,8 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-            C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
deleted file mode 100644
index d5ad0b4c83a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useImplicit() {
-    println(use(getRandomEnumEntry()))
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
deleted file mode 100644
index dc41c6883d8a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public enum Enum {
-    A,
-    B,
-    C
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
deleted file mode 100644
index a5b25884ea62..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-public enum Enum {
-    A,
-    B
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
deleted file mode 100644
index 36bbe755ca3c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log
+++ /dev/null
@@ -1,36 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Enum.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseKt$WhenMappings.class
-  out/production/module/UseKt.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: C
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/Enum.class
-End of files
-Compiling files:
-  src/use.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/Enum.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
deleted file mode 100644
index 2845b19351c2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-import java.util.Random
-
-fun getRandomEnumEntry() =
-        with (Enum.values()) {
-            get(Random().nextInt(size))
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log
deleted file mode 100644
index b0607ab07a57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/gradle-build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/Enum.java
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: C
-
-================ Step #2 =================
-
-Compiling files:
-  src/Enum.java
-  src/getRandomEnumEntry.kt
-  src/use.kt
-  src/useEnumImplicitly.kt
-End of files
-Exit code: OK
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
deleted file mode 100644
index d64d3769328f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-            C -> "C"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
deleted file mode 100644
index 14d2aa5be07b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2
+++ /dev/null
@@ -1,7 +0,0 @@
-import Enum.*
-
-fun use(e: Enum): String =
-        when (e) {
-            A -> "A"
-            B -> "B"
-        }
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
deleted file mode 100644
index d5ad0b4c83a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useImplicit() {
-    println(use(getRandomEnumEntry()))
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
deleted file mode 100644
index 3d21230b981a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public void foo() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
deleted file mode 100644
index 55262a600a87..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public void foo() {
-    }
-
-    public void bar() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
deleted file mode 100644
index b00a2ba28a73..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log
+++ /dev/null
@@ -1,15 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
deleted file mode 100644
index 8285440f8f22..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().foo()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
deleted file mode 100644
index e1200efb2d20..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass().foo()
-    JavaClass().bar()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java
deleted file mode 100644
index 84cdc5aa2fa1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java
+++ /dev/null
@@ -1,5 +0,0 @@
-import org.jetbrains.annotations.Nullable;
-
-class A {
-    @Nullable String s = "A.s";
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1
deleted file mode 100644
index aadb3a9a699f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/A.java.new.1
+++ /dev/null
@@ -1,5 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-class A {
-    @NotNull String s = "A.s";
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt
deleted file mode 100644
index 80bf657d9eef..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/AChild.kt
+++ /dev/null
@@ -1 +0,0 @@
-internal class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt
deleted file mode 100644
index be783c00c18c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/Dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Dummy
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log
deleted file mode 100644
index 71afaa9238a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log
deleted file mode 100644
index 5ada4a700d54..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/gradle-build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-================ Step #1 =================
-Compiling files:
-  src/useA.kt
-  src/AChild.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt
deleted file mode 100644
index 2300e214d173..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    A().s
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java
deleted file mode 100644
index 962471e0db4c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import org.jetbrains.annotations.Nullable;
-
-class A {
-    void f(@Nullable String s) {
-        System.out.println(s);
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1
deleted file mode 100644
index b4a5d22bc453..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/A.java.new.1
+++ /dev/null
@@ -1,7 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-class A {
-    void f(@NotNull String s) {
-        System.out.println(s);
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt
deleted file mode 100644
index 97cfbde5d2dd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-internal class AChild : A() {
-    override fun f(s: String?) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2
deleted file mode 100644
index c8fb196e4006..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/AChild.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-internal class AChild : A() {
-    override fun f(s: String) {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt
deleted file mode 100644
index be783c00c18c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/Dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Dummy
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log
deleted file mode 100644
index f22ff34c7da5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/build.log
+++ /dev/null
@@ -1,39 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
-Cleaning output files:
-  out/production/module/AChild.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'f' overrides nothing
-Null can not be a value of a non-null type String
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt
deleted file mode 100644
index 39133eb87e93..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    A().f(null)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2
deleted file mode 100644
index 3e74807f4cb0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged/useA.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    A().f("useA")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java
deleted file mode 100644
index 474211554258..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java
+++ /dev/null
@@ -1,8 +0,0 @@
-import org.jetbrains.annotations.Nullable;
-
-class A {
-    @Nullable
-    String f() {
-        return "A.f";
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1
deleted file mode 100644
index 8fdf10eea559..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/A.java.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-import org.jetbrains.annotations.NotNull;
-
-class A {
-    @NotNull
-    String f() {
-        return "A.f";
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt
deleted file mode 100644
index 67236df6aeeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-internal class AChild : A() {
-    override fun f(): String? = "AChild.f"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2
deleted file mode 100644
index b5f45e4e0f32..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/AChild.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-internal class AChild : A() {
-    override fun f(): String = "AChild.f"
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt
deleted file mode 100644
index be783c00c18c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/Dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Dummy
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log
deleted file mode 100644
index 3aea89e6c853..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/build.log
+++ /dev/null
@@ -1,38 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
-Cleaning output files:
-  out/production/module/AChild.class
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseAKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useA.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Return type of 'f' is not a subtype of the return type of the overridden member '@NotNull public/*package*/ open fun f(): String defined in A'
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/A.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/A.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt
deleted file mode 100644
index f485f3fb8d88..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useA() {
-    val s = A().f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt
deleted file mode 100644
index 34fce1c44ec4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-public class Sub: Super() {
-    private fun y() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java
deleted file mode 100644
index 93dd06a5f942..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class Super {
-    public void x() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new
deleted file mode 100644
index 821c0e89edf4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Super {
-    public void x() {
-    }
-
-    public void y() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log
deleted file mode 100644
index cc331800e3b1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Super.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Super.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Sub.class
-End of files
-Compiling files:
-  src/Sub.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Cannot weaken access privilege 'public' for 'y' in 'Super'
-'y' hides member of supertype 'Super' and needs 'override' modifier
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java
deleted file mode 100644
index 588b1e9ad440..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JavaClass {
-    public void f(String s) {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new
deleted file mode 100644
index 43dd2ac8345d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new
+++ /dev/null
@@ -1,5 +0,0 @@
-public class JavaClass {
-    public void g(String s) {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
deleted file mode 100644
index 822681ec9597..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/WillBeResolvedToOtherKt.class
-  out/production/module/WillBeUnresolvedKt.class
-End of files
-Compiling files:
-  src/willBeResolvedToOther.kt
-  src/willBeUnresolved.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: f
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt
deleted file mode 100644
index 72082d09fc6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-fun willBeResolvedToOther() {
-    fun JavaClass.f(s: String) {
-    }
-
-    JavaClass().f(":|")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt
deleted file mode 100644
index ee4c233631a5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun willBeUnresolved() {
-    JavaClass().f(":(")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java
deleted file mode 100644
index 8e202758dadf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract public class BaseClass {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1
deleted file mode 100644
index 3de389d9caaa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-// add abstract method, when derived class is not abstract
-abstract public class BaseClass {
-    abstract void myAbs();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2
deleted file mode 100644
index 03c9cfedb007..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-// fix
-public class BaseClass {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3
deleted file mode 100644
index 581d6f3becbf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.3
+++ /dev/null
@@ -1,6 +0,0 @@
-// add method to Base, that does not clash with derived
-public class BaseClass {
-    void doSmthAnother() {
-        System.out.println(":)");
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4
deleted file mode 100644
index 196cdcc35158..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.4
+++ /dev/null
@@ -1,7 +0,0 @@
-// add method to Base, that CLASH with derived
-public class BaseClass {
-    void doSmthAnother() {
-        System.out.println(":)");
-    }
-    void doSmth() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5
deleted file mode 100644
index 91d23bb37ea6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.5
+++ /dev/null
@@ -1,6 +0,0 @@
-// fix clash
-public class BaseClass {
-    void doSmthAnother() {
-        System.out.println(":)");
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7
deleted file mode 100644
index 0eba476783a5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/BaseClass.java.new.7
+++ /dev/null
@@ -1,6 +0,0 @@
-// change return type
-public class BaseClass {
-    String doSmthAnother() {
-        return ":)";
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt
deleted file mode 100644
index 12f7d7fd0101..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-open class DerivedClass1 : BaseClass() {
-    fun doSmth() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6
deleted file mode 100644
index c7d7e9498043..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/DerivedClass1.kt.new.6
+++ /dev/null
@@ -1,6 +0,0 @@
-open class DerivedClass1 : BaseClass() {
-    fun doSmth() {}
-    override fun doSmthAnother() {
-        println(":))")
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log
deleted file mode 100644
index 3f7c84f33c46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance/build.log
+++ /dev/null
@@ -1,125 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-Cleaning output files:
-  out/production/module/DerivedClass1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Class 'DerivedClass1' is not abstract and does not implement abstract base class member public/*package*/ abstract fun myAbs(): Unit defined in BaseClass
-
-================ Step #2 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-
-================ Step #3 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-
-================ Step #4 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-Cleaning output files:
-  out/production/module/DerivedClass1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-'doSmth' hides member of supertype 'BaseClass' and needs 'override' modifier
-
-================ Step #5 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-Cleaning output files:
-  out/production/module/DerivedClass1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #6 =================
-
-Cleaning output files:
-  out/production/module/DerivedClass1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #7 =================
-
-Cleaning output files:
-  out/production/module/BaseClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/BaseClass.java
-End of files
-Cleaning output files:
-  out/production/module/DerivedClass1.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/DerivedClass1.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Return type of 'doSmthAnother' is not a subtype of the return type of the overridden member 'public/*package*/ open fun doSmthAnother(): String! defined in BaseClass'
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java
deleted file mode 100644
index 15f4844a8da7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public static void foo() {
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log
deleted file mode 100644
index 1b429defcb64..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log
+++ /dev/null
@@ -1,10 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/JavaClass.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaClass.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt
deleted file mode 100644
index 43c9b8575bcf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args: Array<String>) {
-    JavaClass.foo()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java
deleted file mode 100644
index beaca0eddc3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    Object run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new
deleted file mode 100644
index 0f3a85d741dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-public interface SamInterface {
-    Object run();
-    Object walk();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
deleted file mode 100644
index 589017c97e08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/SamInterface.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/SamInterface.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
-  out/production/module/UsageWithFunctionExpressionKt.class
-  out/production/module/UsageWithFunctionLiteralKt.class
-End of files
-Compiling files:
-  src/usageWithFunctionExpression.kt
-  src/usageWithFunctionLiteral.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Interface SamInterface does not have constructors
-Interface SamInterface does not have constructors
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt
deleted file mode 100644
index e1a791d43192..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun notUsage() {
-    println("!")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt
deleted file mode 100644
index f7536d864078..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun usageWithFunctionExpression() {
-    val a = { ":)" }
-    SamInterface(a)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt
deleted file mode 100644
index da7b85ec4898..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithFunctionLiteral() {
-    SamInterface { ":)" }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java
deleted file mode 100644
index af51e2ff1f1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public void foo(SamInterface s) {}
-    public static void bar(SamInterface s) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java
deleted file mode 100644
index beaca0eddc3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    Object run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new
deleted file mode 100644
index 0f3a85d741dc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/SamInterface.java.new
+++ /dev/null
@@ -1,4 +0,0 @@
-public interface SamInterface {
-    Object run();
-    Object walk();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log
deleted file mode 100644
index a1ce129c7047..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/build.log
+++ /dev/null
@@ -1,24 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/SamInterface.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/SamInterface.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithMemberKt.class
-  out/production/module/UsageWithStaticKt.class
-End of files
-Compiling files:
-  src/usageWithMember.kt
-  src/usageWithStatic.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Type mismatch: inferred type is () -> String but SamInterface! was expected
-Type mismatch: inferred type is () -> String but SamInterface! was expected
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt
deleted file mode 100644
index 7810a873f022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun notUsage() {
-    JavaClass().hashCode()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt
deleted file mode 100644
index a92386ab9e21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithMember.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithMember() {
-    JavaClass().foo { "" }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt
deleted file mode 100644
index ff97effc8a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter/usageWithStatic.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithStatic() {
-    JavaClass.bar { "" }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java
deleted file mode 100644
index beaca0eddc3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    Object run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new
deleted file mode 100644
index 9e0be424c35a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    String run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
deleted file mode 100644
index 0725bf3275bc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/SamInterface.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/SamInterface.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class
-  out/production/module/UsageWithFunctionExpressionKt.class
-  out/production/module/UsageWithFunctionLiteralKt.class
-End of files
-Compiling files:
-  src/usageWithFunctionExpression.kt
-  src/usageWithFunctionLiteral.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt
deleted file mode 100644
index e1a791d43192..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun notUsage() {
-    println("!")
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt
deleted file mode 100644
index f7536d864078..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-fun usageWithFunctionExpression() {
-    val a = { ":)" }
-    SamInterface(a)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt
deleted file mode 100644
index da7b85ec4898..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithFunctionLiteral() {
-    SamInterface { ":)" }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java
deleted file mode 100644
index af51e2ff1f1c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/JavaClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public class JavaClass {
-    public void foo(SamInterface s) {}
-    public static void bar(SamInterface s) {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java
deleted file mode 100644
index beaca0eddc3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    Object run();
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new
deleted file mode 100644
index 1fdb59474eb9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/SamInterface.java.new
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface SamInterface {
-    String run();
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log
deleted file mode 100644
index c76349dd08b4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/build.log
+++ /dev/null
@@ -1,21 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/SamInterface.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/SamInterface.java
-End of files
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UsageWithMemberKt.class
-  out/production/module/UsageWithStaticKt.class
-End of files
-Compiling files:
-  src/usageWithMember.kt
-  src/usageWithStatic.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt
deleted file mode 100644
index 7810a873f022..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/notUsage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun notUsage() {
-    JavaClass().hashCode()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt
deleted file mode 100644
index a92386ab9e21..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithMember.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithMember() {
-    JavaClass().foo { "" }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt
deleted file mode 100644
index ff97effc8a75..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter/usageWithStatic.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun usageWithStatic() {
-    JavaClass.bar { "" }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
deleted file mode 100644
index 24f7dfeeee08..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class JavaUsage {
-    public static void main(String[] args) {
-        test.FunKt.f("x");
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
deleted file mode 100644
index 7fcd3cd0cfeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/JavaUsage.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/JavaUsage.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt
deleted file mode 100644
index 15105c825eda..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(a: String) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new
deleted file mode 100644
index 911f5ceeebc1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-@kotlin.jvm.JvmOverloads
-fun f(a: String, b: Int = 5) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt
deleted file mode 100644
index d26394252525..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun other() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java
deleted file mode 100644
index 9749b3a6a933..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java
+++ /dev/null
@@ -1,2 +0,0 @@
-public class NotUsage {
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
deleted file mode 100644
index 0aba103dd32b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt
deleted file mode 100644
index c9398192af48..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new
deleted file mode 100644
index c32d0732df46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo(): String {
-  return "Hello, world!"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
deleted file mode 100644
index b492ee33f0f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Usage {
-    public static void main(String[] args) {
-        test.FunKt.foo();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
deleted file mode 100644
index 40d5de2889b7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/Usage.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Usage.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt
deleted file mode 100644
index c9398192af48..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new
deleted file mode 100644
index c32d0732df46..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo(): String {
-  return "Hello, world!"
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
deleted file mode 100644
index e15e43e97ffd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/Usage.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Usage.java
-End of files
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
deleted file mode 100644
index cd3256a76121..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
deleted file mode 100644
index 49b604cd74f2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        const val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
deleted file mode 100644
index 009db0433dc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
deleted file mode 100644
index 44e612f1bb9f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        const val CONST = "bar"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
deleted file mode 100644
index 9fdeb34fe1ed..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class WillBeUnresolved {
-    void main() {
-        test.FunKt.f(":(");
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
deleted file mode 100644
index 964b7dddef9e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/WillBeUnresolved.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/WillBeUnresolved.java
-End of files
-COMPILATION FAILED
-cannot find symbol
-  symbol:   method f(java.lang.String)
-  location: class test.FunKt
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt
deleted file mode 100644
index 470b3d1fd17e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun f(s: String) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new
deleted file mode 100644
index af45b699cb10..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun g(s: String) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
deleted file mode 100644
index 033ea714bb90..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt
deleted file mode 100644
index f5d8342d4911..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        @JvmField
-        val CONST = "BF"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new
deleted file mode 100644
index 247548db1f83..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        // Old and new constant values are different, but their hashes are the same
-        @JvmField
-        val CONST = "Ae"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java
deleted file mode 100644
index 9430b8d5f66e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import test.*;
-
-class Usage {
-    public static void main(String[] args) {
-        System.out.println(Klass.CONST + Klass.CONST);
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log
deleted file mode 100644
index 009db0433dc9..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log
+++ /dev/null
@@ -1,12 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Klass$Companion.class
-  out/production/module/test/Klass.class
-End of files
-Compiling files:
-  src/const.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt
deleted file mode 100644
index 203275f21605..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Klass {
-    companion object {
-        @JvmField
-        val CONST = "bar"
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java
deleted file mode 100644
index d3a612801c6a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Sub extends Super {
-    private void y() {
-
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt
deleted file mode 100644
index 4529a54de25e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-public open class Super {
-    public fun x() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new
deleted file mode 100644
index 051e98129721..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public open class Super {
-    public fun x() {
-    }
-
-    public fun y() {
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
deleted file mode 100644
index ecbfcfb5fa2d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Super.class
-End of files
-Compiling files:
-  src/Super.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/Sub.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/Sub.java
-End of files
-COMPILATION FAILED
-y() in Sub cannot override y() in Super
-  overridden method is final
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
deleted file mode 100644
index b492ee33f0f4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Usage {
-    public static void main(String[] args) {
-        test.FunKt.foo();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
deleted file mode 100644
index 0aba103dd32b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/FunKt.class
-End of files
-Compiling files:
-  src/fun.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt
deleted file mode 100644
index c9398192af48..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun foo() {
-
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
deleted file mode 100644
index b0c2df3d720b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class Usage {
-    void usage() {
-        test.AKt.a();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
deleted file mode 100644
index eeaf99f195c4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun a() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
deleted file mode 100644
index 783ac74aae83..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun b() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
deleted file mode 100644
index a6bea40cf77d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
+++ /dev/null
@@ -1,2 +0,0 @@
-package test
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
deleted file mode 100644
index 9c5c0846c6bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
deleted file mode 100644
index b0c2df3d720b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class Usage {
-    void usage() {
-        test.AKt.a();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
deleted file mode 100644
index 91e2e0b5602e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new
+++ /dev/null
@@ -1,6 +0,0 @@
-class Usage {
-    void usage() {
-        test.AKt.a();
-        test.BKt.b();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt
deleted file mode 100644
index eeaf99f195c4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun a() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new
deleted file mode 100644
index 783ac74aae83..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-fun b() {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
deleted file mode 100644
index 674ffb38d8fd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log
+++ /dev/null
@@ -1,13 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/Usage.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/Usage.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt
deleted file mode 100644
index 8ef96f4bcc86..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA {
-    public fun meth1() {}
-    private fun meth2() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new
deleted file mode 100644
index 6d0606c2c96d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public class ClassA {
-    public fun meth1() {}
-    private fun meth3() {}
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java
deleted file mode 100644
index 92adacc5303b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package test;
-
-public class Usage {
-    public static void f() {
-        new ClassA().meth1();
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log
deleted file mode 100644
index 40268c20a0f8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/ClassA.class
-End of files
-Compiling files:
-  src/ClassA.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
deleted file mode 100644
index f4445f338388..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class WillBeUnresolved {
-    void main() {
-        test.PropKt.getProp();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
deleted file mode 100644
index b4add23f8b04..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/PropKt.class
-End of files
-Compiling files:
-  src/prop.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/WillBeUnresolved.class
-End of files
-Exit code: NOTHING_DONE
-------------------------------------------
-Compiling files:
-  src/WillBeUnresolved.java
-End of files
-COMPILATION FAILED
-cannot find symbol
-  symbol:   method getProp()
-  location: class test.PropKt
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt
deleted file mode 100644
index 43ed22b0657a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val prop = ":)"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new
deleted file mode 100644
index af84143993bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-val prop1 = ":)"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt
deleted file mode 100644
index 0228de5e71d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun a() = "a"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt
deleted file mode 100644
index f3809d038666..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun b() = "b"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new
deleted file mode 100644
index cb5f6909f8d0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("B")
-package test
-
-fun b() = "b"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log
deleted file mode 100644
index d0f049c87135..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt
deleted file mode 100644
index 2ff821a2d527..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package other
-
-fun other() = "other"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt
deleted file mode 100644
index db702d74fea1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    println(a() + b() + other.other())
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java
deleted file mode 100644
index efd7fa38e2fb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/A.java
+++ /dev/null
@@ -1 +0,0 @@
-public class A {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2
deleted file mode 100644
index 3e191f19471a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/B.kt.new.2
+++ /dev/null
@@ -1 +0,0 @@
-class B
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log
deleted file mode 100644
index 5c29308f2cff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/build.log
+++ /dev/null
@@ -1,18 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/MainKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/B.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt
deleted file mode 100644
index 5278c037c961..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-fun main(args: Array<String>) {
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded/main.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/build.log
deleted file mode 100644
index f507ae55e95f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/class2.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/Klass.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Compiling files:
-  src/class1.kt
-  src/class2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Redeclaration: Klass
-Redeclaration: Klass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class1.kt
deleted file mode 100644
index bc00411157bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class1.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Klass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class2.kt.new
deleted file mode 100644
index bc00411157bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classRedeclaration/class2.kt.new
+++ /dev/null
@@ -1 +0,0 @@
-class Klass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt
deleted file mode 100644
index 0d0cb607aa57..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-open class A {
-    companion object {
-        @JvmStatic
-        fun f() {}
-
-        @JvmStatic
-        fun g() {}
-    }
-
-    fun h() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/A.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt
deleted file mode 100644
index 84330c7a659c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-class AChild : A() {
-    fun j() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2
deleted file mode 100644
index 418b0d7b34e6..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/AChild.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-class AChild {
-    fun j() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1
deleted file mode 100644
index 239196110cc7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartF.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("A")
-@file:JvmMultifileClass
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1
deleted file mode 100644
index 12630fa19af5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/APartG.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("A")
-@file:JvmMultifileClass
-
-fun g() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/build.log
deleted file mode 100644
index f49b2b6fd804..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/build.log
+++ /dev/null
@@ -1,56 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A$Companion.class
-  out/production/module/A.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/getA.kt
-  src/getAChild.kt
-  src/useF.kt
-  src/useG.kt
-  src/useH.kt
-  src/useJ.kt
-Cleaning output files:
-  out/production/module/AChild.class
-  out/production/module/GetAChildKt.class
-  out/production/module/GetAKt.class
-  out/production/module/UseFKt.class
-  out/production/module/UseGKt.class
-  out/production/module/UseHKt.class
-  out/production/module/UseJKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/APartF.kt
-  src/APartG.kt
-  src/getA.kt
-  src/getAChild.kt
-  src/useF.kt
-  src/useG.kt
-  src/useH.kt
-  src/useJ.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: A
-Unresolved reference: A
-Unresolved reference: A
-Unresolved reference: A
-
-================ Step #2 =================
-
-Compiling files:
-  src/AChild.kt
-  src/APartF.kt
-  src/APartG.kt
-  src/getAChild.kt
-  src/useF.kt
-  src/useG.kt
-  src/useJ.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt
deleted file mode 100644
index bd04874b85bd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getA() = A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getA.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt
deleted file mode 100644
index ed38025e9ef5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/getAChild.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun getAChild() = AChild()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt
deleted file mode 100644
index 9bd8424ac7cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useF() {
-    A.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2
deleted file mode 100644
index 595d5dea9eaa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useF.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useF() {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt
deleted file mode 100644
index 4582166085af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useG() {
-    A.g()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2
deleted file mode 100644
index a27d417106a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useG.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useG() {
-    g()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt
deleted file mode 100644
index 73891bcb3d82..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useH() {
-    getA().h()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useH.kt.delete.2
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useJ.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useJ.kt
deleted file mode 100644
index 9a8084e94cfb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/classToPackageFacade/useJ.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useJ() {
-    getAChild().j()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log
deleted file mode 100644
index 75079fd9213e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Utils.class
-  out/production/module/test/Utils__Fun2Kt.class
-End of files
-Compiling files:
-  src/fun2.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: List<Any>): Unit defined in test
-    fun function(list: List<String>): Unit defined in test in file fun2.kt
-Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: List<Any>): Unit defined in test
-    fun function(list: List<String>): Unit defined in test in file fun2.kt
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt
deleted file mode 100644
index 5099b2ad971e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/directives.txt
+++ /dev/null
@@ -1 +0,0 @@
-// IGNORE_BACKEND: JVM_IR
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt
deleted file mode 100644
index c40775ad126d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun1.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun function(list: List<Any>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt
deleted file mode 100644
index 5cfb71fb5fa0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-val x = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new
deleted file mode 100644
index b52b4557d42b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/conflictingPlatformDeclarations/fun2.kt.new
+++ /dev/null
@@ -1,9 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-val x = 1
-
-fun function(list: List<String>) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt
deleted file mode 100644
index 1aa0cb739a34..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-open class A(x: Int)
-
-// The use of annotation here is intentional, so no change for "fun A" is detected,
-// but after adding default value to A constructor, we want to force resolve to the constructor
-@Deprecated("Warning", level = DeprecationLevel.WARNING)
-fun A() = A(30)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1
deleted file mode 100644
index 9c989355cd0f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-open class A(x: Int = 10)
-
-// The use of annotation here is intentional, so no change for "fun A" is detected,
-// but after adding default value to A constructor, we want to force resolve to the constructor
-@Deprecated("Hidden", level = DeprecationLevel.HIDDEN)
-fun A() = A(30)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt
deleted file mode 100644
index a0a7d08e730c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-open class B() : A(20)
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt
deleted file mode 100644
index 1cf6ddc7b3b2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class C : B()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log
deleted file mode 100644
index ffa764fb7408..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log
+++ /dev/null
@@ -1,32 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-  out/production/module/foo/AKt.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/B.class
-  out/production/module/foo/CreateADefaultKt.class
-  out/production/module/foo/CreateANonDefaultKt.class
-  out/production/module/foo/UseAKt.class
-End of files
-Compiling files:
-  src/B.kt
-  src/createADefault.kt
-  src/createANonDefault.kt
-  src/useA.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt
deleted file mode 100644
index 0dd71808c106..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createADefault() {
-    A()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt
deleted file mode 100644
index e8df2c0192d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createANonDefault() {
-    A(15)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt
deleted file mode 100644
index b563c0896036..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun createB() {
-    B()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt
deleted file mode 100644
index b156f1532aea..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useA(a: A) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt
deleted file mode 100644
index 3b441f0463cf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun useB(b: B) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log
deleted file mode 100644
index bc7a894621cb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/A.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt
deleted file mode 100644
index 789dc274f724..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package test
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt
deleted file mode 100644
index 5907d8b0e38e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package inline
-
-class A {
-    var z = 0
-
-    @JvmName("fff")
-    inline fun f(): Int = 0
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1
deleted file mode 100644
index 4e545bd9b8d2..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1
+++ /dev/null
@@ -1,8 +0,0 @@
-package inline
-
-class A {
-    var z = 0
-
-    @JvmName("fff")
-    inline fun f(): Int = 1
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt
deleted file mode 100644
index 8a4446e20948..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-fun use() = inline.A().f()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt
deleted file mode 100644
index dbc194da3a1b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
- @JvmName("test") inline fun g() = 0
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new
deleted file mode 100644
index a7cdecaf3fb4..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/inline.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-@JvmName("test") inline fun g() = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt
deleted file mode 100644
index abd575668fd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-val x = inline.g()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log
deleted file mode 100644
index 98c5e9ece93d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/InlineKt.class
-End of files
-Compiling files:
-  src/inline.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt
deleted file mode 100644
index ced1160f719d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package inline
-
-inline val f: Int
-    @JvmName("getG") get() = 0
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new
deleted file mode 100644
index 7fe7e429c94a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/inline.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package inline
-
-inline val f: Int
-    @JvmName("getG") get() = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt
deleted file mode 100644
index b11c96eea3d7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-val x = inline.f
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt
deleted file mode 100644
index c46629ef9446..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Introspector.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract class Introspector<M : Model>(protected val model: Model) {
-    protected abstract inner class Retriever(protected val transaction: Any) {
-        protected var model: Model = this@Introspector.model
-    }
-
-    protected abstract inner class SchemaRetriever(transaction: Any): Retriever(transaction) {
-        protected inline fun inSchema(crossinline modifier: (Any) -> Unit) =
-                model.modify { schema -> modifier.invoke(schema) }
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new
deleted file mode 100644
index 75ae9d6cf2da..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/IntrospectorImpl.kt.new
+++ /dev/null
@@ -1,12 +0,0 @@
-class IntrospectorImpl(model: ModuleImpl) : Introspector<ModuleImpl>(model) {
-    private inner class SchemaRetriever(transaction: Any) : Introspector<ModuleImpl>.SchemaRetriever(transaction) {
-        internal fun retrieve() {
-            inSchema { schema -> println(schema) }
-        }
-    }
-}
-
-class ModuleImpl : Model {
-    override fun modify(modifier: ModelModifier) {}
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java
deleted file mode 100644
index 82f6d6476f6b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/Model.java
+++ /dev/null
@@ -1,4 +0,0 @@
-public interface Model {
-    void modify(ModelModifier modifier);
-}
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java
deleted file mode 100644
index fb19636744f1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/ModelModifier.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public interface ModelModifier {
-    void perform(Object element);
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log
deleted file mode 100644
index 632a8a2344b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/build.log
+++ /dev/null
@@ -1,7 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/IntrospectorImpl.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt
deleted file mode 100644
index 33a577d56a3e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo
-
-open class A {
-    @JvmName("g")
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt.new
deleted file mode 100644
index 5c9fa2560e0c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/A.kt.new
+++ /dev/null
@@ -1,6 +0,0 @@
-package foo
-
-open class A {
-    @JvmName("h")
-    fun f() {}
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/AChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/AChild.kt
deleted file mode 100644
index 154d37341dd3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/AChild.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-class AChild : A()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/build.log
deleted file mode 100644
index 42d665fcb099..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/A.class
-End of files
-Compiling files:
-  src/A.kt
-End of files
-Marked as dirty by Kotlin:
-  src/AChild.kt
-  src/useAChild.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AChild.class
-  out/production/module/foo/UseAChildKt.class
-End of files
-Compiling files:
-  src/AChild.kt
-  src/useAChild.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt
deleted file mode 100644
index 147d93fcd865..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/jvmNameChanged/useAChild.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package foo
-
-fun useAChild(a: AChild) {
-    a.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt
deleted file mode 100644
index 8eb2fb2be08c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun main(args: Array<String>) = println("a")
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt.new
deleted file mode 100644
index 4feab3ef68d8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/a.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun main(args: Array<String>) = println("A")
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/b.kt
deleted file mode 100644
index 7d4e748601ca..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/b.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun main(args: Array<String>) = println("b")
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/build.log
deleted file mode 100644
index 9758c44ea24d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/mainRedeclaration/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/foo/AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt
deleted file mode 100644
index dcb3f87f413c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = ""
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new
deleted file mode 100644
index 1aa2c839861e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/b.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = ""
-fun b(s: String = "") = s
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
deleted file mode 100644
index 5ab0e5a89b3b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
+++ /dev/null
@@ -1,25 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-  out/production/module/test/Test__BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt
deleted file mode 100644
index 7b1bf24bdd12..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package usage
-
-import test.*
-
-fun usage() {
-    a()
-    b()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/b.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/build.log
deleted file mode 100644
index 063de2e64364..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Marked as dirty by Kotlin:
-  src/a.kt
-  src/b.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-  out/production/module/test/Test__BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log
deleted file mode 100644
index 32399a71bd81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileAdded/gradle-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new
deleted file mode 100644
index 6ce025497fcf..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/b.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "bcd"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/build.log
deleted file mode 100644
index ff973ffb2dc8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-  out/production/module/test/Test__BKt.class
-End of files
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log
deleted file mode 100644
index 32399a71bd81..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileChanged/gradle-build.log
+++ /dev/null
@@ -1,8 +0,0 @@
-================ Step #1 =================
-
-Compiling files:
-  src/a.kt
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new
deleted file mode 100644
index 5099c5bae8a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/b.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test1") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log
deleted file mode 100644
index 82fd3845d428..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__BKt.class
-End of files
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt
deleted file mode 100644
index 5099b2ad971e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass/directives.txt
+++ /dev/null
@@ -1 +0,0 @@
-// IGNORE_BACKEND: JVM_IR
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/build.log
deleted file mode 100644
index 5a7cd69239ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt
deleted file mode 100644
index f4fa4554f734..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inline.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt
deleted file mode 100644
index 38501b19b1f3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/inlineOther.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package other
-
-inline fun f(body: () -> Unit) {
-    println("i'm other inline function")
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt
deleted file mode 100644
index e5bb1ff52132..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunction/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log
deleted file mode 100644
index 5a7cd69239ae..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt
deleted file mode 100644
index cd2c740e29db..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inline.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-val property = ":)"
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function" + property)
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt
deleted file mode 100644
index 693cebd353a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/inlineOther.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package other
-
-val property = ":)"
-
-inline fun f(body: () -> Unit) {
-    println("i'm inline function" + property)
-    body()
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt
deleted file mode 100644
index e5bb1ff52132..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-fun main(args: Array<String>) {
-    f { println("to be inlined") }
-    other.f { println("to be inlined") }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField/usage.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/a.kt.delete.1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/b.kt.new.2
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/build.log
deleted file mode 100644
index 6b8c48454eeb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreated/build.log
+++ /dev/null
@@ -1,19 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1
deleted file mode 100644
index 1d3ad0fe2c4a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/a.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test2") JvmMultifileClass]
-package test2
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/b.kt.new.2
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log
deleted file mode 100644
index 654861fc4c1f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming/build.log
+++ /dev/null
@@ -1,20 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-End of files
-Compiling files:
-  src/a.kt
-End of files
-Exit code: OK
-------------------------------------------
-
-================ Step #2 =================
-
-Compiling files:
-  src/b.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt
deleted file mode 100644
index 63a63e173a0a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun a() = "a"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/a.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt
deleted file mode 100644
index cb1f3f58a0a7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:[JvmName("Test") JvmMultifileClass]
-package test
-
-fun b() = "b"
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/b.kt.delete
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/build.log
deleted file mode 100644
index 30620ff3626c..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Test.class
-  out/production/module/test/Test__AKt.class
-End of files
-Cleaning output files:
-  out/production/module/test/Test__BKt.class
-End of files
-Compiling files:
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt
deleted file mode 100644
index 9448caad8747..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileClassRemoved/dummy.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package foo
-
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/build.log
deleted file mode 100644
index 46f53873474b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/build.log
+++ /dev/null
@@ -1,23 +0,0 @@
-================ Step #1 =================
-
-Marked as dirty by Kotlin:
-  src/partB.kt
-  src/usagePartB.kt
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/OuterClass$InnerClass.class
-  out/production/module/OuterClass.class
-  out/production/module/UsagePartBKt.class
-  out/production/module/Utils.class
-  out/production/module/Utils__PartAKt.class
-  out/production/module/Utils__PartBKt.class
-End of files
-Compiling files:
-  src/partA.kt
-  src/partB.kt
-  src/usagePartB.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: OuterClass
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partA.kt
deleted file mode 100644
index 457823b86a76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partA.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val aVal: Int get() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt
deleted file mode 100644
index bab0026e0729..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val bVal: Int get() = 0
-
-class OuterClass{
-    inner class InnerClass {
-        val getZero: Int get() = 0
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1
deleted file mode 100644
index a180e128110b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val bVal: Int get() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt
deleted file mode 100644
index 306a92e27733..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun zero() = OuterClass().InnerClass().getZero
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
deleted file mode 100644
index 8326f0654d7b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
+++ /dev/null
@@ -1,30 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Utils.class
-  out/production/module/Utils__PartAKt.class
-  out/production/module/Utils__PartBKt.class
-  out/production/module/Utils__PartCKt.class
-End of files
-Compiling files:
-  src/partA.kt
-  src/partB.kt
-  src/partC.kt
-End of files
-Marked as dirty by Kotlin:
-  src/useFooF.kt
-  src/useFooG.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/UseFooFKt.class
-  out/production/module/UseFooGKt.class
-End of files
-Compiling files:
-  src/useFooF.kt
-  src/useFooG.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt
deleted file mode 100644
index a0bd73ccf29d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partA.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-fun f(x: Any) {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt
deleted file mode 100644
index 4bc354a97b88..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-fun g(x: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1
deleted file mode 100644
index 84330654a1bb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partB.kt.new.1
+++ /dev/null
@@ -1,6 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-fun f(x: Int) {}
-
-fun g(x: Int?) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt
deleted file mode 100644
index 5cd12424f495..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/partC.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-fun h(x: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt
deleted file mode 100644
index 0c51fdb0b17b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooF.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useFooF() {
-    f(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt
deleted file mode 100644
index 46308f2117fb..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooG.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useFooG() {
-    g(10)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt
deleted file mode 100644
index fc8e1380c3df..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePackagePartMethodAdded/useFooH.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useFooH() {
-    h(10)
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
deleted file mode 100644
index f20d8533f5f3..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/Utils.class
-  out/production/module/Utils__PartAKt.class
-  out/production/module/Utils__PartBKt.class
-End of files
-Compiling files:
-  src/partA.kt
-  src/partB.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt
deleted file mode 100644
index 3f0c1c772420..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/dummy.kt
+++ /dev/null
@@ -1 +0,0 @@
-fun dummy() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt
deleted file mode 100644
index 457823b86a76..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partA.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val aVal: Int get() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt
deleted file mode 100644
index a180e128110b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val bVal: Int get() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1
deleted file mode 100644
index f1df801bed2a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/multifilePartsWithProperties/partB.kt.new.1
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-
-val bVal: String get() = "1"
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/build.log
deleted file mode 100644
index ce955a3768c7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/OtherKt.class
-End of files
-Compiling files:
-  src/other.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/fun.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/fun.kt
deleted file mode 100644
index 911f5ceeebc1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/fun.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-@kotlin.jvm.JvmOverloads
-fun f(a: String, b: Int = 5) {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt
deleted file mode 100644
index d26394252525..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun other() {
-
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt.touch b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt.touch
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/optionalParameter/other.kt.touch
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1
deleted file mode 100644
index 7d3c7f52835a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/A.kt.new.1
+++ /dev/null
@@ -1,9 +0,0 @@
-class A {
-    companion object {
-        @JvmStatic
-        fun f() {}
-
-        @JvmStatic
-        fun g() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/AA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/AA.kt
deleted file mode 100644
index 9ef19a4fd8ee..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/AA.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-class AA {
-    companion object {
-        fun f() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt
deleted file mode 100644
index 239196110cc7..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("A")
-@file:JvmMultifileClass
-
-fun f() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartF.kt.delete.1
+++ /dev/null
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt
deleted file mode 100644
index 12630fa19af5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-@file:JvmName("A")
-@file:JvmMultifileClass
-
-fun g() {}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1
deleted file mode 100644
index 7d3c7f52835a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/APartG.kt.delete.1
+++ /dev/null
@@ -1,9 +0,0 @@
-class A {
-    companion object {
-        @JvmStatic
-        fun f() {}
-
-        @JvmStatic
-        fun g() {}
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java
deleted file mode 100644
index df661a79b099..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/UseFJava.java
+++ /dev/null
@@ -1,5 +0,0 @@
-class UseFJava {
-    void doUse() {
-        A.f();
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/build.log
deleted file mode 100644
index a9ed2d8e2c07..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/build.log
+++ /dev/null
@@ -1,38 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/A.class
-  out/production/module/A__APartFKt.class
-  out/production/module/META-INF/module.kotlin_module
-End of files
-Cleaning output files:
-  out/production/module/A__APartGKt.class
-End of files
-Cleaning output files:
-  out/production/module/UseFJava.class
-  out/production/module/UseFKt.class
-  out/production/module/UseGKt.class
-End of files
-Compiling files:
-  src/A.kt
-  src/useF.kt
-  src/useG.kt
-End of files
-Exit code: ABORT
-------------------------------------------
-COMPILATION FAILED
-Unresolved reference: f
-Unresolved reference: g
-
-================ Step #2 =================
-
-Compiling files:
-  src/A.kt
-  src/useF.kt
-  src/useG.kt
-End of files
-Exit code: OK
-------------------------------------------
-Compiling files:
-  src/UseFJava.java
-End of files
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt
deleted file mode 100644
index 8a4d0ff3e5a5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useAA.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useAA() {
-    AA.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt
deleted file mode 100644
index 595d5dea9eaa..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useF() {
-    f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2
deleted file mode 100644
index 9bd8424ac7cc..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useF.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useF() {
-    A.f()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt
deleted file mode 100644
index a27d417106a0..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useG() {
-    g()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2 b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2
deleted file mode 100644
index 4582166085af..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageFacadeToClass/useG.kt.new.2
+++ /dev/null
@@ -1,3 +0,0 @@
-fun useG() {
-    A.g()
-}
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log
deleted file mode 100644
index 66ffa3ed402b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Utils.class
-  out/production/module/test/Utils__Pkg1Kt.class
-  out/production/module/test/Utils__Pkg2Kt.class
-End of files
-Compiling files:
-  src/pkg1.kt
-  src/pkg2.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt
deleted file mode 100644
index a12c5ff15698..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun1() {}
-
-private val deletedVal1: Int = 20
-
-private fun deletedFun1(): Int = 10
-
-private fun changedFun1(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new
deleted file mode 100644
index 8a45c20ac772..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun1() {}
-
-private val addedVal1: Int = 20
-
-private fun addedFun1(): Int = 50
-
-private fun changedFun1(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt
deleted file mode 100644
index d6dc1f33a879..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun2() {}
-
-fun publicDeletedFun2() {}
-
-private val deletedVal2: Int = 20
-
-private fun deletedFun2(): Int = 10
-
-private fun changedFun2(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new
deleted file mode 100644
index cf3e6de1d843..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new
+++ /dev/null
@@ -1,13 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun2() {}
-
-fun publicAddedFun2() {}
-
-private val addedVal2: Int = 20
-
-private fun addedFun2(): Int = 50
-
-private fun changedFun2(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt
deleted file mode 100644
index 95078b37afec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Usage {
-    fun f() {
-        commonFun1()
-        commonFun2()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log
deleted file mode 100644
index 66ffa3ed402b..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/build.log
+++ /dev/null
@@ -1,14 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/Utils.class
-  out/production/module/test/Utils__Pkg1Kt.class
-  out/production/module/test/Utils__Pkg2Kt.class
-End of files
-Compiling files:
-  src/pkg1.kt
-  src/pkg2.kt
-End of files
-Exit code: OK
-------------------------------------------
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt
deleted file mode 100644
index a12c5ff15698..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun1() {}
-
-private val deletedVal1: Int = 20
-
-private fun deletedFun1(): Int = 10
-
-private fun changedFun1(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new
deleted file mode 100644
index 8a45c20ac772..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun1() {}
-
-private val addedVal1: Int = 20
-
-private fun addedFun1(): Int = 50
-
-private fun changedFun1(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt
deleted file mode 100644
index 6b58f659dffd..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun2() {}
-
-private val deletedVal2: Int = 20
-
-private fun deletedFun2(): Int = 10
-
-private fun changedFun2(arg: Int) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new
deleted file mode 100644
index d8719658566f..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new
+++ /dev/null
@@ -1,11 +0,0 @@
-@file:JvmName("Utils")
-@file:JvmMultifileClass
-package test
-
-fun commonFun2() {}
-
-private val addedVal2: Int = 20
-
-private fun addedFun2(): Int = 50
-
-private fun changedFun2(arg: String) {}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt
deleted file mode 100644
index 95078b37afec..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged/usage.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package test
-
-class Usage {
-    fun f() {
-        commonFun1()
-        commonFun2()
-    }
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log
deleted file mode 100644
index 157ba41596ff..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/build.log
+++ /dev/null
@@ -1,11 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test2/Prop2Kt.class
-End of files
-Compiling files:
-  src/prop2.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
deleted file mode 100644
index ebb7a7603e6e..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-@file:JvmName("TTest")
-@file:JvmMultifileClass
-package test
-
-var property = 1
-    private set
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
deleted file mode 100644
index 5378c878b137..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test2
-import test.*
-
-fun dummy() {
-    if (true) 1 else property
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
deleted file mode 100644
index 7060f03a59b5..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-fun dummy() {
-    if (true) 2 else property
-}
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log
deleted file mode 100644
index cce51e9e605d..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/inline/FunctionKt.class
-End of files
-Compiling files:
-  src/function.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt
deleted file mode 100644
index b548d6416989..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-@JvmName("oldName") fun g() = 0
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new
deleted file mode 100644
index 1f04d228c288..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/function.kt.new
+++ /dev/null
@@ -1,3 +0,0 @@
-package inline
-
-@JvmName("newName") fun g() = 1
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt
deleted file mode 100644
index abd575668fd1..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelFunctionWithJvmName/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-val x = inline.g()
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log
deleted file mode 100644
index c9ee99392d6a..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/build.log
+++ /dev/null
@@ -1,22 +0,0 @@
-================ Step #1 =================
-
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/test/PropertyKt.class
-End of files
-Compiling files:
-  src/property.kt
-End of files
-Marked as dirty by Kotlin:
-  src/usage.kt
-Exit code: ADDITIONAL_PASS_REQUIRED
-------------------------------------------
-Cleaning output files:
-  out/production/module/META-INF/module.kotlin_module
-  out/production/module/usage/UsageKt.class
-End of files
-Compiling files:
-  src/usage.kt
-End of files
-Exit code: OK
-------------------------------------------
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt
deleted file mode 100644
index da702f5f5096..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-val g: Int
-    @JvmName("oldName") get() = 0
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new
deleted file mode 100644
index 39bbfb29c7e8..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/property.kt.new
+++ /dev/null
@@ -1,4 +0,0 @@
-package test
-
-val g: Int
-    @JvmName("newName") get() = 0
\ No newline at end of file
diff --git a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt b/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt
deleted file mode 100644
index 06dfeea7c862..000000000000
--- a/plugins/kotlin/jps/jps-plugin/tests/testData/incremental/withJava/other/topLevelPropertyWithJvmName/usage.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package usage
-
-val x = test.g
\ No newline at end of file
diff --git a/plugins/kotlin/junit/kotlin.junit.iml b/plugins/kotlin/junit/kotlin.junit.iml
index a0c8fe146f1e..b2c3e84c550b 100644
--- a/plugins/kotlin/junit/kotlin.junit.iml
+++ b/plugins/kotlin/junit/kotlin.junit.iml
@@ -21,5 +21,6 @@
     <orderEntry type="module" module-name="intellij.java.execution.impl" />
     <orderEntry type="module" module-name="intellij.junit" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index fe259481f163..d907ab83f483 100644
--- a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+++ b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -34,6 +34,7 @@ import com.intellij.xdebugger.frame.XStackFrame
 import com.jetbrains.jdi.LocalVariableImpl
 import com.sun.jdi.*
 import com.sun.jdi.request.ClassPrepareRequest
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile
 import org.jetbrains.kotlin.codegen.inline.KOTLIN_STRATA_NAME
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -46,7 +47,6 @@ import org.jetbrains.kotlin.idea.debugger.breakpoints.getLambdasAtLineIfAny
 import org.jetbrains.kotlin.idea.debugger.stackFrame.InlineStackTraceCalculator
 import org.jetbrains.kotlin.idea.debugger.stackFrame.KotlinStackFrame
 import org.jetbrains.kotlin.idea.debugger.stepping.smartStepInto.isSamLambda
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
 import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.idea.util.application.getServiceSafe
diff --git a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFunctionBreakpoint.java b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFunctionBreakpoint.java
index 643ad6d04736..03a9ce5ab314 100644
--- a/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFunctionBreakpoint.java
+++ b/plugins/kotlin/jvm-debugger/core/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFunctionBreakpoint.java
@@ -51,11 +51,11 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.java.debugger.breakpoints.properties.JavaMethodBreakpointProperties;
+import org.jetbrains.kotlin.analysis.decompiler.psi.file.KtClsFile;
 import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
 import org.jetbrains.kotlin.asJava.builder.LightMemberOrigin;
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod;
 import org.jetbrains.kotlin.idea.debugger.KotlinDebuggerCoreBundle;
-import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile;
 import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper;
 import org.jetbrains.kotlin.psi.KtClass;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
diff --git a/plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XDebuggerTreeSelectedNodeListener.kt b/plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XDebuggerTreeSelectedNodeListener.kt
index fcc649b5217e..a8c6f7f1a46e 100644
--- a/plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XDebuggerTreeSelectedNodeListener.kt
+++ b/plugins/kotlin/jvm-debugger/coroutines/src/org/jetbrains/kotlin/idea/debugger/coroutine/view/XDebuggerTreeSelectedNodeListener.kt
@@ -12,11 +12,11 @@ import com.intellij.xdebugger.frame.XExecutionStack
 import com.intellij.xdebugger.frame.XStackFrame
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree
 import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl
+import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsClassFinder.isKotlinInternalCompiledFile
 import org.jetbrains.kotlin.idea.debugger.coroutine.data.*
 import org.jetbrains.kotlin.idea.debugger.coroutine.proxy.invokeLater
 import org.jetbrains.kotlin.idea.debugger.coroutine.util.suspendContextImpl
 import org.jetbrains.kotlin.idea.debugger.invokeInManagerThread
-import org.jetbrains.kotlin.idea.decompiler.classFile.isKotlinInternalCompiledFile
 import java.awt.event.KeyAdapter
 import java.awt.event.KeyEvent
 import java.awt.event.MouseEvent
diff --git a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt
index 1c5799e347e5..8e1ab25995de 100644
--- a/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt
+++ b/plugins/kotlin/jvm-debugger/evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentCompiler.kt
@@ -144,7 +144,7 @@ class CodeFragmentCompiler(private val executionContext: ExecutionContext, priva
         ).apply {
             if (fragmentCompilerBackend == FragmentCompilerBackend.JVM_IR) {
                 val mangler = JvmDescriptorMangler(MainFunctionDetector(bindingContext, compilerConfiguration.languageVersionSettings))
-                val evaluatorFragmentInfo = EvaluatorFragmentInfo.createWithFragmentParameterInfo(
+                val evaluatorFragmentInfo = EvaluatorFragmentInfo(
                     codegenInfo.classDescriptor,
                     codegenInfo.methodDescriptor,
                     codegenInfo.parameters.map { EvaluatorFragmentParameterInfo(it.targetDescriptor, it.isLValue) }
@@ -207,7 +207,8 @@ class CodeFragmentCompiler(private val executionContext: ExecutionContext, priva
                                 }
                             }
                         },
-                        evaluatorFragmentInfoForPsi2Ir = evaluatorFragmentInfo
+                        evaluatorFragmentInfoForPsi2Ir = evaluatorFragmentInfo,
+                        shouldStubAndNotLinkUnboundSymbols = true
                     )
                 )
             }
diff --git a/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml b/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
index 8f0df7edd62d..3314130ac052 100644
--- a/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
+++ b/plugins/kotlin/jvm-debugger/sequence/kotlin.jvm-debugger.sequence.iml
@@ -16,5 +16,6 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.java.psi" />
     <orderEntry type="module" module-name="intellij.java.debugger.streams" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/jvm-debugger/sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt b/plugins/kotlin/jvm-debugger/sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
index 32a6f95e2ad0..3b5df694d1d6 100644
--- a/plugins/kotlin/jvm-debugger/sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
+++ b/plugins/kotlin/jvm-debugger/sequence/src/org/jetbrains/kotlin/idea/debugger/sequence/psi/KotlinPsiUtil.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.kotlin.idea.debugger.sequence.psi
 
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
diff --git a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
index 8ee0017e327b..0b8b032f90cc 100644
--- a/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
+++ b/plugins/kotlin/jvm-debugger/test/kotlin.jvm-debugger.test.iml
@@ -45,5 +45,6 @@
     <orderEntry type="module" module-name="kotlin.native" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.analysis" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractKotlinEvaluateExpressionInMppTest.kt b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractKotlinEvaluateExpressionInMppTest.kt
new file mode 100644
index 000000000000..c4bacd6816d9
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractKotlinEvaluateExpressionInMppTest.kt
@@ -0,0 +1,223 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package org.jetbrains.kotlin.idea.debugger.test
+
+import com.intellij.execution.ExecutionTestCase
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.doWriteAction
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.DependencyScope
+import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.testFramework.PsiTestUtil
+import com.intellij.util.containers.MultiMap
+import org.jetbrains.kotlin.idea.stubs.createMultiplatformFacetM3
+import org.jetbrains.kotlin.idea.test.InTextDirectivesUtils
+import org.jetbrains.kotlin.platform.TargetPlatform
+import org.jetbrains.kotlin.platform.js.JsPlatforms
+import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
+import org.jetbrains.kotlin.platform.konan.NativePlatforms
+import org.jetbrains.kotlin.types.typeUtil.closure
+import java.io.File
+
+/**
+ * This test allows to imitate a project with hierarchical multiplatform structure for the JVM debugger.
+ *
+ * Since non-JVM debuggers are not covered by the test, only one of two platforms can be declared for a module:
+ * ```
+ * // PLATFORM: jvm
+ * or
+ * // PLATFORM: common
+ * ```
+ *
+ * Platform of the leaf JVM module ('jvm') is JVM; for all other modules default platform is COMMON, but can be changed to JVM as well.
+ *
+ * Project structure can be set by defining dependencies between modules via DEPENDS_ON.
+ * Transitive refinement dependencies should **NOT** be declared.
+ * ```
+ * // DEPENDS_ON: <module_name>[, <module_name>, ...]
+ * ```
+ *
+ * Both directives should belong to any file inside a module (after MODULE and FILE directives).
+ * Multiples of the same directive in any one module in one or several of its files are forbidden.
+ *
+ * A single leaf JVM module named 'jvm' is expected in a test with multiple modules, all other modules are considered common,
+ * can have arbitrary name and can be referenced by their name in a DEPENDS_ON list of another module.
+ * The resulting DEPENDS_ON graph is not checked for cycles or hanging nodes, so be careful when defining dependencies.
+ *
+ * A small clarification on common modules with JVM platform.
+ * In hierarchical multiplatform projects a platform of a common module is determined by all leaf platform modules depending on it.
+ * Therefore, if only a JVM module depends on a common module, the latter one will have the JVM platform too.
+ *
+ * In this test non-JVM modules are not described (as they are not related to the JVM debugger), but it is implicitly considered,
+ * that common modules with 'COMMON' platform have other non-JVM modules depending on them. Since they have no
+ * other impact apart from changing common module's platform, files of these modules are irrelevant and not described in test data.
+ *
+ * Sample test data for a project with three modules consequently depending on one another.
+ * Root common module has non-jvm descendants not mentioned in the test, intermediate module only has a jvm descendant.
+ * ```
+ * // MODULE: common
+ * // FILE: commonFile.kt
+ * // PLATFORM: common
+ * /* optionally code and test directives for debugger */
+ *
+ * // MODULE: intermediate
+ * // FILE: intermediateFile.kt
+ * // PLATFORM: jvm
+ * // DEPENDS_ON: common
+ * /* optionally code and test directives for debugger */
+ *
+ * // MODULE: jvm
+ * // FILE: leafJvmFile.kt
+ * // PLATFORM: jvm
+ * // DEPENDS_ON: intermediate
+ * /* optionally code and test directives for debugger */
+ * ```
+ */
+abstract class AbstractKotlinEvaluateExpressionInMppTest : AbstractKotlinEvaluateExpressionTest() {
+    override fun useIrBackend(): Boolean = true
+
+    override fun configureProjectByTestFiles(testFiles: List<TestFileWithModule>) {
+        val context = ConfigurationContext(
+            filesByModules = testFiles.groupBy(TestFileWithModule::module),
+            dependsOnEdges = MultiMap.create(),
+            workspaceModuleMap = mutableMapOf(),
+        )
+
+        check(context.filesByModules.keys.filterIsInstance<DebuggerTestModule.Jvm>().size == 1) {
+            "Exactly one leaf JVM module expected"
+        }
+
+        for ((module, files) in context.filesByModules) {
+            configureModuleByTestFiles(module, files, context)
+        }
+
+        setUpExtraModuleDependenciesFromDependsOnEdges(context)
+    }
+
+    private fun configureModuleByTestFiles(
+        module: DebuggerTestModule,
+        files: List<TestFileWithModule>,
+        context: ConfigurationContext,
+    ) {
+        val (platformName, dependsOnModuleNames) = handleDirectives(module, files, context)
+
+        when (module) {
+            is DebuggerTestModule.Common -> createAndConfigureCommonModule(context, module, platformName, dependsOnModuleNames)
+            is DebuggerTestModule.Jvm -> configureLeafJvmModule(context, platformName, dependsOnModuleNames)
+        }
+    }
+
+    private fun createAndConfigureCommonModule(
+        context: ConfigurationContext,
+        module: DebuggerTestModule.Common,
+        platformName: PlatformName?,
+        dependsOnModuleNames: List<ModuleName>,
+    ) {
+        val newWorkspaceModule = createModule(module.name).also { context.workspaceModuleMap[module] = it }
+        val commonModuleSrcPath = listOf(testAppPath, COMMON_SOURCES_DIR, module.name).joinToString(File.separator)
+        val commonModuleSrcDir = File(commonModuleSrcPath).also { it.mkdirs() }.refreshAndToVirtualFile()
+            ?: error("Can't find virtual file $commonModuleSrcPath for module ${module.name}")
+
+        val targetPlatform = if (platformName == JVM_PLATFORM) JvmPlatforms.jvm8 else COMMON_MODULE_TARGET_PLATFORM
+
+        doWriteAction {
+            PsiTestUtil.addSourceRoot(newWorkspaceModule, commonModuleSrcDir)
+            newWorkspaceModule.createMultiplatformFacetM3(
+                targetPlatform,
+                true,
+                dependsOnModuleNames,
+                listOf(commonModuleSrcPath)
+            )
+        }
+    }
+
+    private fun configureLeafJvmModule(
+        context: ConfigurationContext,
+        platformName: PlatformName?,
+        dependsOnModuleNames: List<ModuleName>,
+    ) {
+        check(platformName != COMMON_PLATFORM) { "Leaf JVM module cannot have common platform" }
+
+        context.workspaceModuleMap[DebuggerTestModule.Jvm] = myModule
+        val jvmSrcPath = listOf(testAppPath, "src").joinToString(File.separator)
+        doWriteAction {
+            myModule.createMultiplatformFacetM3(JvmPlatforms.jvm8, true, dependsOnModuleNames, listOf(jvmSrcPath))
+        }
+    }
+
+    private fun handleDirectives(
+        module: DebuggerTestModule,
+        moduleFiles: List<TestFileWithModule>,
+        context: ConfigurationContext
+    ): Pair<PlatformName?, List<ModuleName>> {
+        check(moduleFiles.all { file -> file.module == module })
+
+        val platform = findAtMostOneDirectiveInModuleFiles(moduleFiles, PLATFORM_DIRECTIVE.toPrefix())?.trim()?.uppercase()?.also {
+            check(it == JVM_PLATFORM || it == COMMON_PLATFORM) {
+                "Unknown platform notation in test directive: $it. Only $JVM_PLATFORM and $COMMON_PLATFORM are allowed"
+            }
+        }
+
+        val allModuleNames = context.filesByModules.keys.map(DebuggerTestModule::name)
+        val dependsOnModuleNames = findAtMostOneDirectiveInModuleFiles(moduleFiles, DEPENDS_ON_DIRECTIVE.toPrefix())
+            ?.split(", ")?.map(String::trim).orEmpty()
+
+        dependsOnModuleNames.forEach { name ->
+            val dependsOnModule = context.filesByModules.keys.find { it.name == name } ?:
+                error("Unknown module in depends on list. Known modules: $allModuleNames; found: $name for module ${module.name}")
+            context.dependsOnEdges.putValue(module, dependsOnModule)
+        }
+
+        return platform to dependsOnModuleNames
+    }
+
+    private fun findAtMostOneDirectiveInModuleFiles(files: List<TestFileWithModule>, directivePrefix: String): String? {
+        val dependsOnDirectivesForModule = files.flatMap { testFile ->
+            InTextDirectivesUtils.findLinesWithPrefixesRemoved(testFile.content, directivePrefix)
+        }
+
+        assert(dependsOnDirectivesForModule.size <= 1) { "At most one $directivePrefix expected per module" }
+
+        return dependsOnDirectivesForModule.singleOrNull()
+    }
+
+    private fun setUpExtraModuleDependenciesFromDependsOnEdges(context: ConfigurationContext) {
+        for ((module, directDependsOnModules) in context.dependsOnEdges.entrySet()) {
+            directDependsOnModules.closure { context.dependsOnEdges[it] }.forEach { transitiveDependsOnDependency ->
+                doWriteAction {
+                    ModuleRootModificationUtil.addDependency(
+                        context.workspaceModuleMap[module]!!,
+                        context.workspaceModuleMap[transitiveDependsOnDependency]!!,
+                        DependencyScope.COMPILE,
+                        false
+                    )
+                }
+            }
+        }
+    }
+
+    private class ConfigurationContext(
+        val filesByModules: Map<DebuggerTestModule, List<TestFileWithModule>>,
+        val dependsOnEdges: MultiMap<DebuggerTestModule, DebuggerTestModule>,
+        val workspaceModuleMap: MutableMap<DebuggerTestModule, Module>
+    )
+
+    companion object {
+        private val COMMON_MODULE_TARGET_PLATFORM =
+            TargetPlatform(
+                setOf(
+                    JvmPlatforms.jvm8.single(),
+                    JsPlatforms.defaultJsPlatform.single(),
+                    NativePlatforms.unspecifiedNativePlatform.single()
+                )
+            )
+
+        private const val DEPENDS_ON_DIRECTIVE = "DEPENDS_ON"
+        private const val PLATFORM_DIRECTIVE = "PLATFORM"
+        private const val JVM_PLATFORM = "JVM"
+        private const val COMMON_PLATFORM = "COMMON"
+
+        private fun String.toPrefix() = "// $this:"
+    }
+}
+
+private typealias PlatformName = String
+private typealias ModuleName = String
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
index 023b58db2539..efd10ade59d3 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/DebuggerTestCompilerFacility.kt
@@ -4,6 +4,7 @@ package org.jetbrains.kotlin.idea.debugger.test
 
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.doWriteAction
 import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.OrderRootType
@@ -12,6 +13,7 @@ import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.newvfs.ArchiveFileSystem
 import com.intellij.psi.PsiManager
+import org.jetbrains.kotlin.analyzer.AnalysisResult
 import org.jetbrains.kotlin.caches.resolve.KotlinCacheService
 import org.jetbrains.kotlin.cli.common.output.writeAllTo
 import org.jetbrains.kotlin.cli.jvm.compiler.findMainClass
@@ -32,14 +34,14 @@ import org.jetbrains.kotlin.idea.test.testFramework.KtUsefulTestCase
 import java.io.File
 
 class DebuggerTestCompilerFacility(
-    files: List<TestFile>, 
+    files: List<TestFileWithModule>,
     private val jvmTarget: JvmTarget,
     private val useIrBackend: Boolean
 ) {
     private val kotlinStdlibPath = KotlinArtifacts.instance.kotlinStdlib.absolutePath
 
-    private val mainFiles: TestFilesByLanguage
-    private val libraryFiles: TestFilesByLanguage
+    private val mainFiles: TestFilesByLanguageAndPlatform
+    private val libraryFiles: TestFilesByLanguageAndPlatform
     private val mavenArtifacts = mutableListOf<String>()
 
     init {
@@ -56,7 +58,7 @@ class DebuggerTestCompilerFacility(
 
         val testFiles = libSrcPath.walk().filter { it.isFile }.toList().map {
             val path = it.toRelativeString(libSrcPath)
-            TestFile(path, FileUtil.loadFile(it, true))
+            TestFileWithModule(DebuggerTestModule.Jvm, path, FileUtil.loadFile(it, true))
         }
 
         val libraryFiles = splitByLanguage(testFiles)
@@ -69,8 +71,8 @@ class DebuggerTestCompilerFacility(
         }
     }
 
-    fun kotlinStdlibInMavenArtifacts() =
-        mavenArtifacts.find { it.contains(Regex("""kotlin-stdlib-\d+\.\d+\.\d+(\-\w+)?""")) }
+    private fun kotlinStdlibInMavenArtifacts() =
+        mavenArtifacts.find { it.contains(Regex("""kotlin-stdlib-\d+\.\d+\.\d+(-\w+)?""")) }
 
     fun compileLibrary(srcDir: File, classesDir: File) {
         compileLibrary(this.libraryFiles, srcDir, classesDir)
@@ -79,9 +81,13 @@ class DebuggerTestCompilerFacility(
         classesDir.refreshAndToVirtualFile()?.let { KtUsefulTestCase.refreshRecursively(it) }
     }
 
-    private fun compileLibrary(libraryFiles: TestFilesByLanguage, srcDir: File, classesDir: File) = with(libraryFiles) {
+    private fun compileLibrary(
+        libraryFiles: TestFilesByLanguageAndPlatform,
+        srcDir: File,
+        classesDir: File
+    ) = with(libraryFiles) {
         resources.copy(classesDir)
-        (kotlin + java).copy(srcDir)
+        (kotlinJvm + java).copy(srcDir)
 
         if (kotlinStdlibInMavenArtifacts() == null)
             mavenArtifacts.add(kotlinStdlibPath)
@@ -92,7 +98,7 @@ class DebuggerTestCompilerFacility(
             options.add("-Xuse-old-backend")
         }
 
-        if (kotlin.isNotEmpty()) {
+        if (kotlinJvm.isNotEmpty()) {
             KotlinCompilerStandalone(
                 listOf(srcDir), target = classesDir,
                 options = options,
@@ -111,26 +117,30 @@ class DebuggerTestCompilerFacility(
     }
 
     // Returns the qualified name of the main test class.
-    fun compileTestSources(module: Module, srcDir: File, classesDir: File, libClassesDir: File): String = with(mainFiles) {
-        resources.copy(srcDir)
+    fun compileTestSources(
+        module: Module,
+        jvmSrcDir: File,
+        commonSrcDir: File,
+        classesDir: File,
+        libClassesDir: File
+    ): String = with(mainFiles) {
+        resources.copy(jvmSrcDir)
         resources.copy(classesDir) // sic!
-        (kotlin + java).copy(srcDir)
-
-        val ktFiles = mutableListOf<KtFile>()
+        (kotlinJvm + java).copy(jvmSrcDir)
+        kotlinCommon.forEach { testFile -> testFile.copy(commonSrcDir.resolve(testFile.module.name)) }
 
+        lateinit var allKtFiles: List<KtFile>
+        lateinit var jvmKtFiles: List<KtFile>
+        val project = module.project
         doWriteAction {
-            for (file in kotlin + java) {
-                val ioFile = File(srcDir, file.name)
-                val virtualFile = ioFile.refreshAndToVirtualFile() ?: error("Cannot find a VirtualFile instance for file $file")
-                val psiFile = PsiManager.getInstance(module.project).findFile(virtualFile) ?: continue
-
-                if (psiFile is KtFile) {
-                    ktFiles += psiFile
-                }
+            jvmKtFiles = createPsiFilesAndCollectKtFiles(kotlinJvm + java, jvmSrcDir, project)
+            val commonKtFiles = kotlinCommon.groupBy { it.module }.flatMap { (module, files) ->
+                createPsiFilesAndCollectKtFiles(files, commonSrcDir.resolve(module.name), project)
             }
+            allKtFiles = jvmKtFiles + commonKtFiles
         }
 
-        if (ktFiles.isEmpty()) {
+        if (allKtFiles.isEmpty()) {
             error("No Kotlin files found")
         }
 
@@ -140,12 +150,17 @@ class DebuggerTestCompilerFacility(
         lateinit var mainClassName: String
 
         doWriteAction {
-            mainClassName = compileKotlinFilesInIde(module, ktFiles, classesDir)
+            if (kotlinCommon.isNotEmpty()) {
+                compileKotlinFilesWithCliCompiler(jvmSrcDir, commonSrcDir, classesDir)
+                mainClassName = analyzeAndFindMainClass(project, jvmKtFiles)
+            } else {
+                mainClassName = compileKotlinFilesInIde(project, allKtFiles, classesDir)
+            }
         }
 
         if (java.isNotEmpty()) {
             CodegenTestUtil.compileJava(
-                java.map { File(srcDir, it.name).absolutePath },
+                java.map { File(jvmSrcDir, it.name).absolutePath },
                 getClasspath(module) + listOf(classesDir.absolutePath),
                 listOf("-g"),
                 classesDir
@@ -155,34 +170,76 @@ class DebuggerTestCompilerFacility(
         return mainClassName
     }
 
-    private fun compileKotlinFilesInIde(module: Module, files: List<KtFile>, classesDir: File): String {
-        val project = module.project
-        val resolutionFacade = KotlinCacheService.getInstance(project).getResolutionFacade(files)
+    private fun compileKotlinFilesWithCliCompiler(jvmSrcDir: File, commonSrcDir: File, classesDir: File) {
+        KotlinCompilerStandalone(
+            listOf(jvmSrcDir, commonSrcDir), target = classesDir,
+            options = listOf(
+                "-Xuse-ir=$useIrBackend",
+                "-Xcommon-sources=${commonSrcDir.absolutePath}",
+                "-Xmulti-platform"
+            ),
+            classpath = mavenArtifacts.map(::File)
+        ).compile()
+    }
 
-        val analysisResult = resolutionFacade.analyzeWithAllCompilerChecks(files)
+    private fun analyzeAndFindMainClass(project: Project, jvmKtFiles: List<KtFile>): String {
+        val resolutionFacade = KotlinCacheService.getInstance(project).getResolutionFacade(jvmKtFiles)
+
+        val analysisResult = resolutionFacade.analyzeWithAllCompilerChecks(jvmKtFiles)
         analysisResult.throwIfError()
 
-        val configuration = CompilerConfiguration()
-        configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
-        configuration.put(JVMConfigurationKeys.IR, useIrBackend)
-        configuration.put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, true)
+        return findMainClass(analysisResult.bindingContext, resolutionFacade.getLanguageVersionSettings(), jvmKtFiles)?.asString()
+            ?: error("Cannot find main class name")
+    }
 
-        val state = GenerationUtils.generateFiles(project, files, configuration, ClassBuilderFactories.BINARIES, analysisResult) {
-            generateDeclaredClassFilter(GenerationState.GenerateClassFilter.GENERATE_ALL)
-        }
+    private fun compileKotlinFilesInIde(project: Project, files: List<KtFile>, classesDir: File): String {
+        return analyzeAndCompileFiles(project, files) { analysisResult ->
+            val configuration = CompilerConfiguration()
+            configuration.put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
+            configuration.put(JVMConfigurationKeys.IR, useIrBackend)
+            configuration.put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, true)
+
+            val state = GenerationUtils.generateFiles(project, files, configuration, ClassBuilderFactories.BINARIES, analysisResult) {
+                generateDeclaredClassFilter(GenerationState.GenerateClassFilter.GENERATE_ALL)
+            }
 
-        val extraDiagnostics = state.collectedExtraJvmDiagnostics
-        if (!extraDiagnostics.isEmpty()) {
-            val compoundMessage = extraDiagnostics.joinToString("\n") { DefaultErrorMessages.render(it) }
-            error("One or more errors occurred during code generation: \n$compoundMessage")
+            val extraDiagnostics = state.collectedExtraJvmDiagnostics
+            if (!extraDiagnostics.isEmpty()) {
+                val compoundMessage = extraDiagnostics.joinToString("\n") { DefaultErrorMessages.render(it) }
+                error("One or more errors occurred during code generation: \n$compoundMessage")
+            }
+
+            state.factory.writeAllTo(classesDir)
         }
+    }
 
-        state.factory.writeAllTo(classesDir)
+    private fun analyzeAndCompileFiles(project: Project, files: List<KtFile>, compile: (AnalysisResult) -> Unit): String {
+        val resolutionFacade = KotlinCacheService.getInstance(project).getResolutionFacade(files)
+
+        val analysisResult = resolutionFacade.analyzeWithAllCompilerChecks(files)
+        analysisResult.throwIfError()
+
+        compile(analysisResult)
 
         return findMainClass(analysisResult.bindingContext, resolutionFacade.getLanguageVersionSettings(), files)?.asString()
             ?: error("Cannot find main class name")
     }
 
+    private fun createPsiFilesAndCollectKtFiles(testFiles: List<TestFile>, srcDir: File, project: Project): List<KtFile> {
+        val ktFiles = mutableListOf<KtFile>()
+        for (file in testFiles) {
+            val ioFile = File(srcDir, file.name)
+            val virtualFile = ioFile.refreshAndToVirtualFile() ?: error("Cannot find a VirtualFile instance for file $file")
+            val psiFile = PsiManager.getInstance(project).findFile(virtualFile) ?: continue
+
+            if (psiFile is KtFile) {
+                ktFiles += psiFile
+            }
+        }
+
+        return ktFiles
+    }
+
     private fun getClasspath(module: Module): List<String> {
         val moduleRootManager = ModuleRootManager.getInstance(module)
         val classpath = moduleRootManager.orderEntries.filterIsInstance<LibraryOrderEntry>()
@@ -203,23 +260,32 @@ class DebuggerTestCompilerFacility(
     }
 }
 
-private fun File.refreshAndToVirtualFile(): VirtualFile? = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(this)
+internal fun File.refreshAndToVirtualFile(): VirtualFile? = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(this)
 
 private fun List<TestFile>.copy(destination: File) {
     for (file in this) {
-        val target = File(destination, file.name)
-        target.parentFile.mkdirs()
-        target.writeText(file.content)
+        file.copy(destination)
     }
 }
 
-class TestFilesByTarget(val main: List<TestFile>, val library: List<TestFile>)
+private fun TestFile.copy(destination: File) {
+    val target = File(destination, name)
+    target.parentFile.mkdirs()
+    target.writeText(content)
+}
+
+class TestFilesByTarget(val main: List<TestFileWithModule>, val library: List<TestFileWithModule>)
 
-class TestFilesByLanguage(val kotlin: List<TestFile>, val java: List<TestFile>, val resources: List<TestFile>)
+class TestFilesByLanguageAndPlatform(
+    val kotlinJvm: List<TestFileWithModule>,
+    val kotlinCommon: List<TestFileWithModule>,
+    val java: List<TestFileWithModule>,
+    val resources: List<TestFileWithModule>
+)
 
-private fun splitByTarget(files: List<TestFile>): TestFilesByTarget {
-    val main = mutableListOf<TestFile>()
-    val lib = mutableListOf<TestFile>()
+private fun splitByTarget(files: List<TestFileWithModule>): TestFilesByTarget {
+    val main = mutableListOf<TestFileWithModule>()
+    val lib = mutableListOf<TestFileWithModule>()
 
     for (file in files) {
         val container = if (file.name.startsWith("lib/") || file.name.startsWith("customLib/")) lib else main
@@ -229,17 +295,22 @@ private fun splitByTarget(files: List<TestFile>): TestFilesByTarget {
     return TestFilesByTarget(main = main, library = lib)
 }
 
-private fun splitByLanguage(files: List<TestFile>): TestFilesByLanguage {
-    val kotlin = mutableListOf<TestFile>()
-    val java = mutableListOf<TestFile>()
-    val resources = mutableListOf<TestFile>()
+private fun splitByLanguage(files: List<TestFileWithModule>): TestFilesByLanguageAndPlatform {
+    val kotlinJvm = mutableListOf<TestFileWithModule>()
+    val kotlinCommon = mutableListOf<TestFileWithModule>()
+    val java = mutableListOf<TestFileWithModule>()
+    val resources = mutableListOf<TestFileWithModule>()
 
     for (file in files) {
         @Suppress("MoveVariableDeclarationIntoWhen")
         val extension = file.name.substringAfterLast(".", missingDelimiterValue = "")
 
         val container = when (extension) {
-            "kt", "kts" -> kotlin
+            "kt", "kts" ->
+                when (file.module) {
+                    is DebuggerTestModule.Common -> kotlinCommon
+                    is DebuggerTestModule.Jvm -> kotlinJvm
+                }
             "java" -> java
             else -> resources
         }
@@ -247,5 +318,5 @@ private fun splitByLanguage(files: List<TestFile>): TestFilesByLanguage {
         container += file
     }
 
-    return TestFilesByLanguage(kotlin = kotlin, java = java, resources = resources)
+    return TestFilesByLanguageAndPlatform(kotlinJvm = kotlinJvm, kotlinCommon = kotlinCommon, java = java, resources = resources)
 }
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCase.kt b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCase.kt
index 876b388038e8..0884a7737019 100644
--- a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCase.kt
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinDescriptorTestCase.kt
@@ -23,11 +23,10 @@ import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.ThrowableComputable
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.psi.PsiFile
-import com.intellij.testFramework.EdtTestUtil
+import com.intellij.testFramework.runInEdtAndGet
 import com.intellij.util.ThrowableRunnable
 import com.intellij.util.ui.UIUtil
 import com.intellij.xdebugger.XDebugSession
@@ -39,26 +38,23 @@ import org.jetbrains.kotlin.idea.debugger.test.preference.*
 import org.jetbrains.kotlin.idea.debugger.test.util.BreakpointCreator
 import org.jetbrains.kotlin.idea.debugger.test.util.KotlinOutputChecker
 import org.jetbrains.kotlin.idea.debugger.test.util.LogPropagator
-import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
-import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.idea.test.addRoot
-import org.jetbrains.kotlin.idea.test.runAll
-import org.jetbrains.kotlin.idea.test.Directives
+import org.jetbrains.kotlin.idea.test.*
 import org.jetbrains.kotlin.idea.test.KotlinBaseTest.TestFile
-import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils.*
+import org.jetbrains.kotlin.idea.test.TestFiles.*
 import org.jetbrains.kotlin.test.TargetBackend
 import org.junit.ComparisonFailure
 import java.io.File
 
 internal const val KOTLIN_LIBRARY_NAME = "KotlinJavaRuntime"
 internal const val TEST_LIBRARY_NAME = "TestLibrary"
-
-class TestFiles(val originalFile: File, val wholeFile: TestFile, files: List<TestFile>) : List<TestFile> by files
+internal const val COMMON_SOURCES_DIR = "commonSrc"
+internal const val JVM_MODULE_NAME = "jvm"
 
 abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
     private lateinit var testAppDirectory: File
-    private lateinit var sourcesOutputDirectory: File
+    private lateinit var jvmSourcesOutputDirectory: File
+    private lateinit var commonSourcesOutputDirectory: File
 
     private lateinit var librarySrcDirectory: File
     private lateinit var libraryOutputDirectory: File
@@ -77,7 +73,8 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
 
     override fun runBare(testRunnable: ThrowableRunnable<Throwable>) {
         testAppDirectory = tmpDir("debuggerTestSources")
-        sourcesOutputDirectory = File(testAppDirectory, "src").apply { mkdirs() }
+        jvmSourcesOutputDirectory = File(testAppDirectory, "src").apply { mkdirs() }
+        commonSourcesOutputDirectory = File(testAppDirectory, COMMON_SOURCES_DIR).apply { mkdirs() }
 
         librarySrcDirectory = File(testAppDirectory, "libSrc").apply { mkdirs() }
         libraryOutputDirectory = File(testAppDirectory, "lib").apply { mkdirs() }
@@ -124,11 +121,17 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
                 if (useIrBackend()) TargetBackend.JVM_IR_WITH_IR_EVALUATOR else TargetBackend.JVM_WITH_IR_EVALUATOR
         }
 
+    protected open fun configureProjectByTestFiles(testFiles: List<TestFileWithModule>) {
+    }
+
+    @Suppress("UNUSED_PARAMETER")
     fun doTest(unused: String) {
         val wholeFile = testDataFile()
         val wholeFileContents = FileUtil.loadFile(wholeFile, true)
 
         val testFiles = createTestFiles(wholeFile, wholeFileContents)
+        configureProjectByTestFiles(testFiles)
+
         val preferences = DebuggerPreferences(myProject, wholeFileContents)
 
         oldValues = SettingsMutators.mutate(preferences)
@@ -146,8 +149,9 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
         }
 
         compilerFacility.compileLibrary(librarySrcDirectory, libraryOutputDirectory)
-        mainClassName = compilerFacility.compileTestSources(myModule, sourcesOutputDirectory, File(appOutputPath), libraryOutputDirectory)
-
+        mainClassName = compilerFacility.compileTestSources(
+            myModule, jvmSourcesOutputDirectory, commonSourcesOutputDirectory, File(appOutputPath), libraryOutputDirectory
+        )
         breakpointCreator = BreakpointCreator(
             project,
             ::systemLogger,
@@ -175,9 +179,7 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
 
         val environment = ExecutionEnvironmentBuilder(myProject, DefaultDebugExecutor.getDebugExecutorInstance())
             .runnerSettings(debuggerRunnerSettings)
-            .runProfile(object : MockConfiguration() {
-                override fun getProject() = myProject
-            })
+            .runProfile(MockConfiguration(myProject))
             .build()
 
         val javaCommandLineState: JavaCommandLineState = object : JavaCommandLineState(environment) {
@@ -191,8 +193,8 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
         val debugParameters =
             RemoteConnectionBuilder(
                 debuggerRunnerSettings.LOCAL,
-                debuggerRunnerSettings.getTransport(),
-                debuggerRunnerSettings.getDebugPort()
+                debuggerRunnerSettings.transport,
+                debuggerRunnerSettings.debugPort
             )
                 .checkValidity(true)
                 .asyncAgent(true)
@@ -245,13 +247,28 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
     }
 
     private fun createTestFiles(wholeFile: File, wholeFileContents: String): TestFiles {
-        val testFiles = org.jetbrains.kotlin.idea.test.TestFiles.createTestFiles(
+        val testFiles = createTestFiles(
             wholeFile.name,
             wholeFileContents,
-            object : org.jetbrains.kotlin.idea.test.TestFiles.TestFileFactoryNoModules<TestFile>() {
-                override fun create(fileName: String, text: String, directives: Directives): TestFile {
-                    return TestFile(fileName, text, directives)
+            object : TestFileFactory<DebuggerTestModule, TestFileWithModule> {
+                override fun createFile(
+                    module: DebuggerTestModule?,
+                    fileName: String,
+                    text: String,
+                    directives: Directives
+                ): TestFileWithModule {
+                    return TestFileWithModule(module ?: DebuggerTestModule.Jvm, fileName, text, directives)
                 }
+
+                override fun createModule(
+                    name: String,
+                    dependencies: MutableList<String>,
+                    friends: MutableList<String>
+                ) =
+                    when {
+                        name == JVM_MODULE_NAME -> DebuggerTestModule.Jvm
+                        else -> DebuggerTestModule.Common(name)
+                    }
             }
         )
 
@@ -317,10 +334,10 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
     }
 
     private fun detachLibraries() {
-        EdtTestUtil.runInEdtAndGet(ThrowableComputable {
+        runInEdtAndGet {
             ConfigLibraryUtil.removeLibrary(module, KOTLIN_LIBRARY_NAME)
             ConfigLibraryUtil.removeLibrary(module, TEST_LIBRARY_NAME)
-        })
+        }
     }
 
     private fun attachLibrary(model: ModifiableRootModel, libraryName: String, classes: List<File>, sources: List<File>) {
@@ -334,7 +351,7 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
         try {
             super.checkTestOutput()
         } catch (e: ComparisonFailure) {
-            KotlinTestUtils.assertEqualsToFile(getExpectedOutputFile(), e.actual)
+            assertEqualsToFile(getExpectedOutputFile(), e.actual)
         }
     }
 
@@ -354,3 +371,17 @@ abstract class KotlinDescriptorTestCase : DescriptorTestCase() {
         return super.getData(dataId)
     }
 }
+
+class TestFiles(val originalFile: File, val wholeFile: TestFile, files: List<TestFileWithModule>) : List<TestFileWithModule> by files
+
+sealed class DebuggerTestModule(name: String) : KotlinBaseTest.TestModule(name, emptyList(), emptyList())  {
+    class Common(name: String) : DebuggerTestModule(name)
+    object Jvm : DebuggerTestModule(JVM_MODULE_NAME)
+}
+
+class TestFileWithModule(
+    val module: DebuggerTestModule,
+    name: String,
+    content: String,
+    directives: Directives = Directives()
+) : TestFile(name, content, directives)
diff --git a/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java
new file mode 100644
index 000000000000..a9cd9b691a04
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/test/org/jetbrains/kotlin/idea/debugger/test/KotlinEvaluateExpressionInMppTestGenerated.java
@@ -0,0 +1,1528 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+
+package org.jetbrains.kotlin.idea.debugger.test;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.idea.test.JUnit3RunnerWithInners;
+import org.jetbrains.kotlin.idea.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.jetbrains.kotlin.idea.test.TestRoot;
+import org.junit.runner.RunWith;
+import org.jetbrains.kotlin.test.TargetBackend;
+
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
+ * DO NOT MODIFY MANUALLY.
+ */
+@SuppressWarnings("all")
+@TestRoot("jvm-debugger/test")
+@TestDataPath("$CONTENT_ROOT")
+@RunWith(JUnit3RunnerWithInners.class)
+public abstract class KotlinEvaluateExpressionInMppTestGenerated extends AbstractKotlinEvaluateExpressionInMppTest {
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/evaluation/singleBreakpoint")
+    public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionInMppTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+        }
+
+        @TestMetadata("abstractFunCall.kt")
+        public void testAbstractFunCall() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/abstractFunCall.kt");
+        }
+
+        @TestMetadata("accessToOverridenPropertyWithBackingField.kt")
+        public void testAccessToOverridenPropertyWithBackingField() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/accessToOverridenPropertyWithBackingField.kt");
+        }
+
+        @TestMetadata("annotationValue.kt")
+        public void testAnnotationValue() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/annotationValue.kt");
+        }
+
+        @TestMetadata("anonymousObjects.kt")
+        public void testAnonymousObjects() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/anonymousObjects.kt");
+        }
+
+        @TestMetadata("arrayMethods.kt")
+        public void testArrayMethods() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/arrayMethods.kt");
+        }
+
+        @TestMetadata("arrays.kt")
+        public void testArrays() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/arrays.kt");
+        }
+
+        @TestMetadata("boxParam.kt")
+        public void testBoxParam() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/boxParam.kt");
+        }
+
+        @TestMetadata("boxReturnValue.kt")
+        public void testBoxReturnValue() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/boxReturnValue.kt");
+        }
+
+        @TestMetadata("breakpointInInlineFun.kt")
+        public void testBreakpointInInlineFun() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/breakpointInInlineFun.kt");
+        }
+
+        @TestMetadata("callableBug.kt")
+        public void testCallableBug() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/callableBug.kt");
+        }
+
+        @TestMetadata("classFromAnotherPackage.kt")
+        public void testClassFromAnotherPackage() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/classFromAnotherPackage.kt");
+        }
+
+        @TestMetadata("classObjectVal.kt")
+        public void testClassObjectVal() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/classObjectVal.kt");
+        }
+
+        @TestMetadata("collections.kt")
+        public void testCollections() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/collections.kt");
+        }
+
+        @TestMetadata("color.kt")
+        public void testColor() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/color.kt");
+        }
+
+        @TestMetadata("dataClassCopy.kt")
+        public void testDataClassCopy() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/dataClassCopy.kt");
+        }
+
+        @TestMetadata("defaultParameterValues.kt")
+        public void testDefaultParameterValues() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/defaultParameterValues.kt");
+        }
+
+        @TestMetadata("defaultParameterValues2.kt")
+        public void testDefaultParameterValues2() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/defaultParameterValues2.kt");
+        }
+
+        @TestMetadata("delegatedPropertyInOtherFile.kt")
+        public void testDelegatedPropertyInOtherFile() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/delegatedPropertyInOtherFile.kt");
+        }
+
+        @TestMetadata("delegatedVariables.kt")
+        public void testDelegatedVariables() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/delegatedVariables.kt");
+        }
+
+        @TestMetadata("dependentOnFile.kt")
+        public void testDependentOnFile() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/dependentOnFile.kt");
+        }
+
+        @TestMetadata("doubles.kt")
+        public void testDoubles() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/doubles.kt");
+        }
+
+        @TestMetadata("enums.kt")
+        public void testEnums() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/enums.kt");
+        }
+
+        @TestMetadata("errors.kt")
+        public void testErrors() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/errors.kt");
+        }
+
+        @TestMetadata("escapedNames.kt")
+        public void testEscapedNames() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/escapedNames.kt");
+        }
+
+        @TestMetadata("experimentalApi.kt")
+        public void testExperimentalApi() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/experimentalApi.kt");
+        }
+
+        @TestMetadata("extractLocalVariables.kt")
+        public void testExtractLocalVariables() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/extractLocalVariables.kt");
+        }
+
+        @TestMetadata("extractThis.kt")
+        public void testExtractThis() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/extractThis.kt");
+        }
+
+        @TestMetadata("extractThisInTrait.kt")
+        public void testExtractThisInTrait() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/extractThisInTrait.kt");
+        }
+
+        @TestMetadata("extractVariablesFromCall.kt")
+        public void testExtractVariablesFromCall() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/extractVariablesFromCall.kt");
+        }
+
+        @TestMetadata("fieldGetters.kt")
+        public void testFieldGetters() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/fieldGetters.kt");
+        }
+
+        @TestMetadata("fileWithError.kt")
+        public void testFileWithError() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/fileWithError.kt");
+        }
+
+        @TestMetadata("funFromSuperClass.kt")
+        public void testFunFromSuperClass() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/funFromSuperClass.kt");
+        }
+
+        @TestMetadata("functionDeclaration.kt")
+        public void testFunctionDeclaration() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/functionDeclaration.kt");
+        }
+
+        @TestMetadata("functionWithBodyExpression.kt")
+        public void testFunctionWithBodyExpression() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/functionWithBodyExpression.kt");
+        }
+
+        @TestMetadata("genericCrossinlineArgument.kt")
+        public void testGenericCrossinlineArgument() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/genericCrossinlineArgument.kt");
+        }
+
+        @TestMetadata("imports.kt")
+        public void testImports() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/imports.kt");
+        }
+
+        @TestMetadata("importsLambdaContext.kt")
+        public void testImportsLambdaContext() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/importsLambdaContext.kt");
+        }
+
+        @TestMetadata("inlineFunInMultiFilePackage.kt")
+        public void testInlineFunInMultiFilePackage() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunInMultiFilePackage.kt");
+        }
+
+        @TestMetadata("inlineFunInRootPackage.kt")
+        public void testInlineFunInRootPackage() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunInRootPackage.kt");
+        }
+
+        @TestMetadata("inlineFunction.kt")
+        public void testInlineFunction() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunction.kt");
+        }
+
+        @TestMetadata("inlineFunctionBreakpointAnotherFile.kt")
+        public void testInlineFunctionBreakpointAnotherFile() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunctionBreakpointAnotherFile.kt");
+        }
+
+        @TestMetadata("inlineFunctionBreakpointVariants.kt")
+        public void testInlineFunctionBreakpointVariants() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunctionBreakpointVariants.kt");
+        }
+
+        @TestMetadata("inlineFunctionDeepInlining.kt")
+        public void testInlineFunctionDeepInlining() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunctionDeepInlining.kt");
+        }
+
+        @TestMetadata("inlineFunctionDeepInliningSameFile.kt")
+        public void testInlineFunctionDeepInliningSameFile() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineFunctionDeepInliningSameFile.kt");
+        }
+
+        @TestMetadata("inlineMethodsInSignature.kt")
+        public void testInlineMethodsInSignature() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/inlineMethodsInSignature.kt");
+        }
+
+        @TestMetadata("innerClass.kt")
+        public void testInnerClass() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/innerClass.kt");
+        }
+
+        @TestMetadata("insertInBlock.kt")
+        public void testInsertInBlock() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/insertInBlock.kt");
+        }
+
+        @TestMetadata("internalFunctionEvaluate.kt")
+        public void testInternalFunctionEvaluate() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/internalFunctionEvaluate.kt");
+        }
+
+        @TestMetadata("internalProperty.kt")
+        public void testInternalProperty() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/internalProperty.kt");
+        }
+
+        @TestMetadata("javaStaticMethods.kt")
+        public void testJavaStaticMethods() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/javaStaticMethods.kt");
+        }
+
+        @TestMetadata("kClass.kt")
+        public void testKClass() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kClass.kt");
+        }
+
+        @TestMetadata("kt12206BasePropertyWithoutBackingField.kt")
+        public void testKt12206BasePropertyWithoutBackingField() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt12206BasePropertyWithoutBackingField.kt");
+        }
+
+        @TestMetadata("kt15259.kt")
+        public void testKt15259() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt15259.kt");
+        }
+
+        @TestMetadata("kt17514.kt")
+        public void testKt17514() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt17514.kt");
+        }
+
+        @TestMetadata("kt22366.kt")
+        public void testKt22366() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt22366.kt");
+        }
+
+        @TestMetadata("kt25220.kt")
+        public void testKt25220() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt25220.kt");
+        }
+
+        @TestMetadata("kt25222.kt")
+        public void testKt25222() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt25222.kt");
+        }
+
+        @TestMetadata("kt28087.kt")
+        public void testKt28087() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt28087.kt");
+        }
+
+        @TestMetadata("kt29179.kt")
+        public void testKt29179() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt29179.kt");
+        }
+
+        @TestMetadata("kt31709.kt")
+        public void testKt31709() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt31709.kt");
+        }
+
+        @TestMetadata("kt36404.kt")
+        public void testKt36404() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt36404.kt");
+        }
+
+        @TestMetadata("kt5554OnlyIntsShouldBeCoerced.kt")
+        public void testKt5554OnlyIntsShouldBeCoerced() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt5554OnlyIntsShouldBeCoerced.kt");
+        }
+
+        @TestMetadata("kt7046localVarInInline.kt")
+        public void testKt7046localVarInInline() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/kt7046localVarInInline.kt");
+        }
+
+        @TestMetadata("lambdaToString.kt")
+        public void testLambdaToString() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/lambdaToString.kt");
+        }
+
+        @TestMetadata("lambdaWithDestructuring.kt")
+        public void testLambdaWithDestructuring() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/lambdaWithDestructuring.kt");
+        }
+
+        @TestMetadata("localClass.kt")
+        public void testLocalClass() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/localClass.kt");
+        }
+
+        @TestMetadata("localFunctionCapturedLocalVariable.kt")
+        public void testLocalFunctionCapturedLocalVariable() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/localFunctionCapturedLocalVariable.kt");
+        }
+
+        @TestMetadata("localFunctionsWithReceivers.kt")
+        public void testLocalFunctionsWithReceivers() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/localFunctionsWithReceivers.kt");
+        }
+
+        @TestMetadata("localVariables.kt")
+        public void testLocalVariables() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/localVariables.kt");
+        }
+
+        @TestMetadata("methodWithBreakpoint.kt")
+        public void testMethodWithBreakpoint() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/methodWithBreakpoint.kt");
+        }
+
+        @TestMetadata("multilineExpressionAtBreakpoint.kt")
+        public void testMultilineExpressionAtBreakpoint() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/multilineExpressionAtBreakpoint.kt");
+        }
+
+        @TestMetadata("nestedInlineArguments.kt")
+        public void testNestedInlineArguments() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/nestedInlineArguments.kt");
+        }
+
+        @TestMetadata("nonAssignmentLValue.kt")
+        public void testNonAssignmentLValue() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/nonAssignmentLValue.kt");
+        }
+
+        @TestMetadata("nothing.kt")
+        public void testNothing() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/nothing.kt");
+        }
+
+        @TestMetadata("onClassHeader.kt")
+        public void testOnClassHeader() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/onClassHeader.kt");
+        }
+
+        @TestMetadata("onGetter.kt")
+        public void testOnGetter() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/onGetter.kt");
+        }
+
+        @TestMetadata("onObjectHeader.kt")
+        public void testOnObjectHeader() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/onObjectHeader.kt");
+        }
+
+        @TestMetadata("package.kt")
+        public void testPackage() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/package.kt");
+        }
+
+        @TestMetadata("parametersOfInlineFun.kt")
+        public void testParametersOfInlineFun() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/parametersOfInlineFun.kt");
+        }
+
+        @TestMetadata("parametersOfInlineFunSeveralOnLine.kt")
+        public void testParametersOfInlineFunSeveralOnLine() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/parametersOfInlineFunSeveralOnLine.kt");
+        }
+
+        @TestMetadata("privateClass.kt")
+        public void testPrivateClass() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/privateClass.kt");
+        }
+
+        @TestMetadata("privateFieldInCompanion.kt")
+        public void testPrivateFieldInCompanion() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/privateFieldInCompanion.kt");
+        }
+
+        @TestMetadata("privateMember.kt")
+        public void testPrivateMember() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/privateMember.kt");
+        }
+
+        @TestMetadata("privatePropertyWithExplicitDefaultGetter.kt")
+        public void testPrivatePropertyWithExplicitDefaultGetter() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/privatePropertyWithExplicitDefaultGetter.kt");
+        }
+
+        @TestMetadata("privatePropertyWithNonDefaultAccessor.kt")
+        public void testPrivatePropertyWithNonDefaultAccessor() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/privatePropertyWithNonDefaultAccessor.kt");
+        }
+
+        @TestMetadata("protectedMember.kt")
+        public void testProtectedMember() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/protectedMember.kt");
+        }
+
+        @TestMetadata("rawTypeskt11831.kt")
+        public void testRawTypeskt11831() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/rawTypeskt11831.kt");
+        }
+
+        @TestMetadata("simple.kt")
+        public void testSimple() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/simple.kt");
+        }
+
+        @TestMetadata("statements.kt")
+        public void testStatements() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/statements.kt");
+        }
+
+        @TestMetadata("staticField.kt")
+        public void testStaticField() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/staticField.kt");
+        }
+
+        @TestMetadata("stdlib.kt")
+        public void testStdlib() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/stdlib.kt");
+        }
+
+        @TestMetadata("superCallsCaptured.kt")
+        public void testSuperCallsCaptured() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/superCallsCaptured.kt");
+        }
+
+        @TestMetadata("superCallsSimple.kt")
+        public void testSuperCallsSimple() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/superCallsSimple.kt");
+        }
+
+        @TestMetadata("synchronizedBlock.kt")
+        public void testSynchronizedBlock() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/synchronizedBlock.kt");
+        }
+
+        @TestMetadata("typeParameterRef.kt")
+        public void testTypeParameterRef() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/typeParameterRef.kt");
+        }
+
+        @TestMetadata("typedArray.kt")
+        public void testTypedArray() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/typedArray.kt");
+        }
+
+        @TestMetadata("unboxParam.kt")
+        public void testUnboxParam() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/unboxParam.kt");
+        }
+
+        @TestMetadata("unsafeCall.kt")
+        public void testUnsafeCall() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/unsafeCall.kt");
+        }
+
+        @TestMetadata("unusedTransitiveDependencies.kt")
+        public void testUnusedTransitiveDependencies() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/unusedTransitiveDependencies.kt");
+        }
+
+        @TestMetadata("valueParameterName.kt")
+        public void testValueParameterName() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/valueParameterName.kt");
+        }
+
+        @TestMetadata("variableAsFunction.kt")
+        public void testVariableAsFunction() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/variableAsFunction.kt");
+        }
+
+        @TestMetadata("vars.kt")
+        public void testVars() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/vars.kt");
+        }
+
+        @TestMetadata("whenEvaluation.kt")
+        public void testWhenEvaluation() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/whenEvaluation.kt");
+        }
+
+        @TestMetadata(".kt.kt")
+        public void test_kt() throws Exception {
+            runTest("testData/evaluation/singleBreakpoint/.kt.kt");
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/compilingEvaluator")
+        public static class CompilingEvaluator extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("ceAnonymousObject.kt")
+            public void testCeAnonymousObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceAnonymousObject.kt");
+            }
+
+            @TestMetadata("ceAnonymousObjectCapturedInClosure.kt")
+            public void testCeAnonymousObjectCapturedInClosure() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceAnonymousObjectCapturedInClosure.kt");
+            }
+
+            @TestMetadata("ceAnonymousObjectThisAsReceiver.kt")
+            public void testCeAnonymousObjectThisAsReceiver() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceAnonymousObjectThisAsReceiver.kt");
+            }
+
+            @TestMetadata("ceLambda.kt")
+            public void testCeLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceLambda.kt");
+            }
+
+            @TestMetadata("ceLocalClass.kt")
+            public void testCeLocalClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceLocalClass.kt");
+            }
+
+            @TestMetadata("ceLocalClassWithSuperClass.kt")
+            public void testCeLocalClassWithSuperClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceLocalClassWithSuperClass.kt");
+            }
+
+            @TestMetadata("ceObject.kt")
+            public void testCeObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceObject.kt");
+            }
+
+            @TestMetadata("ceSeveralLambdas.kt")
+            public void testCeSeveralLambdas() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/ceSeveralLambdas.kt");
+            }
+
+            @RunWith(JUnit3RunnerWithInners.class)
+            @TestMetadata("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers")
+            public static class InaccessibleMembers extends AbstractKotlinEvaluateExpressionInMppTest {
+                private void runTest(String testDataFilePath) throws Exception {
+                    KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+                }
+
+                @TestMetadata("inaccessibleMembers.kt")
+                public void testInaccessibleMembers() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/inaccessibleMembers.kt");
+                }
+
+                @TestMetadata("inaccessibleMembersNoReflection.kt")
+                public void testInaccessibleMembersNoReflection() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/inaccessibleMembersNoReflection.kt");
+                }
+
+                @TestMetadata("inaccessibleTypes.kt")
+                public void testInaccessibleTypes() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/inaccessibleTypes.kt");
+                }
+
+                @TestMetadata("javaFields.kt")
+                public void testJavaFields() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/javaFields.kt");
+                }
+
+                @TestMetadata("javaMethods.kt")
+                public void testJavaMethods() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/javaMethods.kt");
+                }
+
+                @TestMetadata("kotlinFields.kt")
+                public void testKotlinFields() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/kotlinFields.kt");
+                }
+
+                @TestMetadata("kotlinMethods.kt")
+                public void testKotlinMethods() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/kotlinMethods.kt");
+                }
+
+                @TestMetadata("membersFromLocalClass.kt")
+                public void testMembersFromLocalClass() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/membersFromLocalClass.kt");
+                }
+
+                @TestMetadata("membersFromLocalClassNoReflection.kt")
+                public void testMembersFromLocalClassNoReflection() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/membersFromLocalClassNoReflection.kt");
+                }
+
+                @TestMetadata("outerMembers.kt")
+                public void testOuterMembers() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/outerMembers.kt");
+                }
+
+                @TestMetadata("outerMembersNoReflection.kt")
+                public void testOuterMembersNoReflection() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/outerMembersNoReflection.kt");
+                }
+
+                @TestMetadata("privateAnnotationCompanionValue.kt")
+                public void testPrivateAnnotationCompanionValue() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/privateAnnotationCompanionValue.kt");
+                }
+
+                @TestMetadata("selfMembers.kt")
+                public void testSelfMembers() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/selfMembers.kt");
+                }
+
+                @TestMetadata("selfMembersNoReflection.kt")
+                public void testSelfMembersNoReflection() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/selfMembersNoReflection.kt");
+                }
+
+                @TestMetadata("superMembers.kt")
+                public void testSuperMembers() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/superMembers.kt");
+                }
+
+                @TestMetadata("superMembersNoReflection.kt")
+                public void testSuperMembersNoReflection() throws Exception {
+                    runTest("testData/evaluation/singleBreakpoint/compilingEvaluator/inaccessibleMembers/superMembersNoReflection.kt");
+                }
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/coroutines")
+        public static class Coroutines extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("accessClassPropertyInSuspendFunction.kt")
+            public void testAccessClassPropertyInSuspendFunction() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/accessClassPropertyInSuspendFunction.kt");
+            }
+
+            @TestMetadata("anyUpdateInvokeStatic.kt")
+            public void testAnyUpdateInvokeStatic() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/anyUpdateInvokeStatic.kt");
+            }
+
+            @TestMetadata("anyUpdateVariable.kt")
+            public void testAnyUpdateVariable() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/anyUpdateVariable.kt");
+            }
+
+            @TestMetadata("capturedReceiverName.kt")
+            public void testCapturedReceiverName() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/capturedReceiverName.kt");
+            }
+
+            @TestMetadata("coroutineContextExists.kt")
+            public void testCoroutineContextExists() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/coroutineContextExists.kt");
+            }
+
+            @TestMetadata("coroutineScopeReceiver.kt")
+            public void testCoroutineScopeReceiver() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/coroutineScopeReceiver.kt");
+            }
+
+            @TestMetadata("functionCallWithSuspendFunctionInside.kt")
+            public void testFunctionCallWithSuspendFunctionInside() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/functionCallWithSuspendFunctionInside.kt");
+            }
+
+            @TestMetadata("primitivesCoertion.kt")
+            public void testPrimitivesCoertion() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/primitivesCoertion.kt");
+            }
+
+            @TestMetadata("stringUpdateInvokeStatic.kt")
+            public void testStringUpdateInvokeStatic() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/stringUpdateInvokeStatic.kt");
+            }
+
+            @TestMetadata("stringUpdateInvokeVirtual.kt")
+            public void testStringUpdateInvokeVirtual() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/stringUpdateInvokeVirtual.kt");
+            }
+
+            @TestMetadata("stringUpdatePutField.kt")
+            public void testStringUpdatePutField() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/stringUpdatePutField.kt");
+            }
+
+            @TestMetadata("stringUpdateVariable.kt")
+            public void testStringUpdateVariable() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/stringUpdateVariable.kt");
+            }
+
+            @TestMetadata("suspendFunctionInClass.kt")
+            public void testSuspendFunctionInClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/suspendFunctionInClass.kt");
+            }
+
+            @TestMetadata("suspendFunctionWithInlineClass.kt")
+            public void testSuspendFunctionWithInlineClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/suspendFunctionWithInlineClass.kt");
+            }
+
+            @TestMetadata("suspendFunctionsWithContext.kt")
+            public void testSuspendFunctionsWithContext() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/suspendFunctionsWithContext.kt");
+            }
+
+            @TestMetadata("suspendFunctionsWithoutContext.kt")
+            public void testSuspendFunctionsWithoutContext() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/suspendFunctionsWithoutContext.kt");
+            }
+
+            @TestMetadata("suspendFunctionsWithoutKotlinxCoroutines.kt")
+            public void testSuspendFunctionsWithoutKotlinxCoroutines() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/suspendFunctionsWithoutKotlinxCoroutines.kt");
+            }
+
+            @TestMetadata("uncapturedVariableInSuspendLambda.kt")
+            public void testUncapturedVariableInSuspendLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/coroutines/uncapturedVariableInSuspendLambda.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/createExpression")
+        public static class CreateExpression extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("createExpressionCastToBuiltIn.kt")
+            public void testCreateExpressionCastToBuiltIn() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/createExpression/createExpressionCastToBuiltIn.kt");
+            }
+
+            @TestMetadata("createExpressionSimple.kt")
+            public void testCreateExpressionSimple() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/createExpression/createExpressionSimple.kt");
+            }
+
+            @TestMetadata("createExpressionWithArray.kt")
+            public void testCreateExpressionWithArray() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/createExpression/createExpressionWithArray.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/extraVariables")
+        public static class ExtraVariables extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("evBreakpointOnPropertyDeclaration.kt")
+            public void testEvBreakpointOnPropertyDeclaration() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evBreakpointOnPropertyDeclaration.kt");
+            }
+
+            @TestMetadata("evDelegatedProperty.kt")
+            public void testEvDelegatedProperty() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evDelegatedProperty.kt");
+            }
+
+            @TestMetadata("evDuplicateItems.kt")
+            public void testEvDuplicateItems() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evDuplicateItems.kt");
+            }
+
+            @TestMetadata("evFinalProperty.kt")
+            public void testEvFinalProperty() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evFinalProperty.kt");
+            }
+
+            @TestMetadata("evFunctionDeclaration.kt")
+            public void testEvFunctionDeclaration() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evFunctionDeclaration.kt");
+            }
+
+            @TestMetadata("evLineRange.kt")
+            public void testEvLineRange() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evLineRange.kt");
+            }
+
+            @TestMetadata("evProperty.kt")
+            public void testEvProperty() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evProperty.kt");
+            }
+
+            @TestMetadata("evPropertyRefExpr.kt")
+            public void testEvPropertyRefExpr() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evPropertyRefExpr.kt");
+            }
+
+            @TestMetadata("evSkipAnonymousObject.kt")
+            public void testEvSkipAnonymousObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evSkipAnonymousObject.kt");
+            }
+
+            @TestMetadata("evSkipLambda.kt")
+            public void testEvSkipLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evSkipLambda.kt");
+            }
+
+            @TestMetadata("evSkipLocalClass.kt")
+            public void testEvSkipLocalClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/extraVariables/evSkipLocalClass.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/frame")
+        public static class Frame extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("annotationsAreNotShown.kt")
+            public void testAnnotationsAreNotShown() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/annotationsAreNotShown.kt");
+            }
+
+            @TestMetadata("capturedValues1.kt")
+            public void testCapturedValues1() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/capturedValues1.kt");
+            }
+
+            @TestMetadata("capturedValues2.kt")
+            public void testCapturedValues2() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/capturedValues2.kt");
+            }
+
+            @TestMetadata("catchVariable.kt")
+            public void testCatchVariable() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/catchVariable.kt");
+            }
+
+            @TestMetadata("companionObjectGettersAreNotShown.kt")
+            public void testCompanionObjectGettersAreNotShown() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/companionObjectGettersAreNotShown.kt");
+            }
+
+            @TestMetadata("coroutineContextFun.kt")
+            public void testCoroutineContextFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/coroutineContextFun.kt");
+            }
+
+            @TestMetadata("coroutineContextLambda.kt")
+            public void testCoroutineContextLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/coroutineContextLambda.kt");
+            }
+
+            @TestMetadata("coroutineContextWithoutSuspend.kt")
+            public void testCoroutineContextWithoutSuspend() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/coroutineContextWithoutSuspend.kt");
+            }
+
+            @TestMetadata("defaultImplsMangling.kt")
+            public void testDefaultImplsMangling() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/defaultImplsMangling.kt");
+            }
+
+            @TestMetadata("delegatedPropertyInClass.kt")
+            public void testDelegatedPropertyInClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/delegatedPropertyInClass.kt");
+            }
+
+            @TestMetadata("delegatedPropertyInClassKotlinVariables.kt")
+            public void testDelegatedPropertyInClassKotlinVariables() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/delegatedPropertyInClassKotlinVariables.kt");
+            }
+
+            @TestMetadata("delegatedPropertyInClassWithToString.kt")
+            public void testDelegatedPropertyInClassWithToString() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/delegatedPropertyInClassWithToString.kt");
+            }
+
+            @TestMetadata("delegatedPropertyInClassWoRenderer.kt")
+            public void testDelegatedPropertyInClassWoRenderer() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/delegatedPropertyInClassWoRenderer.kt");
+            }
+
+            @TestMetadata("frameAnonymousObject.kt")
+            public void testFrameAnonymousObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameAnonymousObject.kt");
+            }
+
+            @TestMetadata("frameClassObject.kt")
+            public void testFrameClassObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameClassObject.kt");
+            }
+
+            @TestMetadata("frameClosingBracket.kt")
+            public void testFrameClosingBracket() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameClosingBracket.kt");
+            }
+
+            @TestMetadata("frameExtFunExtFun.kt")
+            public void testFrameExtFunExtFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameExtFunExtFun.kt");
+            }
+
+            @TestMetadata("frameExtensionFun.kt")
+            public void testFrameExtensionFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameExtensionFun.kt");
+            }
+
+            @TestMetadata("frameInlineArgument.kt")
+            public void testFrameInlineArgument() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInlineArgument.kt");
+            }
+
+            @TestMetadata("frameInlineArgumentInsideInlineFun.kt")
+            public void testFrameInlineArgumentInsideInlineFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInlineArgumentInsideInlineFun.kt");
+            }
+
+            @TestMetadata("frameInlineFun.kt")
+            public void testFrameInlineFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInlineFun.kt");
+            }
+
+            @TestMetadata("frameInlineFunCallInsideInlineFun.kt")
+            public void testFrameInlineFunCallInsideInlineFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInlineFunCallInsideInlineFun.kt");
+            }
+
+            @TestMetadata("frameInlineFunCallInsideInlineFunKotlinVariables.kt")
+            public void testFrameInlineFunCallInsideInlineFunKotlinVariables() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInlineFunCallInsideInlineFunKotlinVariables.kt");
+            }
+
+            @TestMetadata("frameInnerClass.kt")
+            public void testFrameInnerClass() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInnerClass.kt");
+            }
+
+            @TestMetadata("frameInnerLambda.kt")
+            public void testFrameInnerLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameInnerLambda.kt");
+            }
+
+            @TestMetadata("frameLambda.kt")
+            public void testFrameLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameLambda.kt");
+            }
+
+            @TestMetadata("frameLambdaNotUsed.kt")
+            public void testFrameLambdaNotUsed() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameLambdaNotUsed.kt");
+            }
+
+            @TestMetadata("frameLocalVariable.kt")
+            public void testFrameLocalVariable() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameLocalVariable.kt");
+            }
+
+            @TestMetadata("frameObject.kt")
+            public void testFrameObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameObject.kt");
+            }
+
+            @TestMetadata("frameSharedVar.kt")
+            public void testFrameSharedVar() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameSharedVar.kt");
+            }
+
+            @TestMetadata("frameSharedVarLocalVar.kt")
+            public void testFrameSharedVarLocalVar() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameSharedVarLocalVar.kt");
+            }
+
+            @TestMetadata("frameSimple.kt")
+            public void testFrameSimple() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameSimple.kt");
+            }
+
+            @TestMetadata("frameThis0.kt")
+            public void testFrameThis0() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameThis0.kt");
+            }
+
+            @TestMetadata("frameThis0Ext.kt")
+            public void testFrameThis0Ext() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameThis0Ext.kt");
+            }
+
+            @TestMetadata("frameThis0This0.kt")
+            public void testFrameThis0This0() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/frameThis0This0.kt");
+            }
+
+            @TestMetadata("getterOfLateinitVariableIsNotShown.kt")
+            public void testGetterOfLateinitVariableIsNotShown() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/getterOfLateinitVariableIsNotShown.kt");
+            }
+
+            @TestMetadata("gettersAreNotDuplicated.kt")
+            public void testGettersAreNotDuplicated() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/gettersAreNotDuplicated.kt");
+            }
+
+            @TestMetadata("hideContinuationThis.kt")
+            public void testHideContinuationThis() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/hideContinuationThis.kt");
+            }
+
+            @TestMetadata("hideSyntheticThis.kt")
+            public void testHideSyntheticThis() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/hideSyntheticThis.kt");
+            }
+
+            @TestMetadata("inlineFunThisKotlinVariables.kt")
+            public void testInlineFunThisKotlinVariables() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/inlineFunThisKotlinVariables.kt");
+            }
+
+            @TestMetadata("lambdaAsValueArgument.kt")
+            public void testLambdaAsValueArgument() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaAsValueArgument.kt");
+            }
+
+            @TestMetadata("lambdaFun1.kt")
+            public void testLambdaFun1() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaFun1.kt");
+            }
+
+            @TestMetadata("lambdaFun2.kt")
+            public void testLambdaFun2() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaFun2.kt");
+            }
+
+            @TestMetadata("lambdaFun3.kt")
+            public void testLambdaFun3() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaFun3.kt");
+            }
+
+            @TestMetadata("lambdaFun4.kt")
+            public void testLambdaFun4() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaFun4.kt");
+            }
+
+            @TestMetadata("lambdaParameterMangling.kt")
+            public void testLambdaParameterMangling() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaParameterMangling.kt");
+            }
+
+            @TestMetadata("lambdaThisMangling.kt")
+            public void testLambdaThisMangling() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/lambdaThisMangling.kt");
+            }
+
+            @TestMetadata("localFunctionMangling.kt")
+            public void testLocalFunctionMangling() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/localFunctionMangling.kt");
+            }
+
+            @TestMetadata("nestedInlineFun.kt")
+            public void testNestedInlineFun() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/nestedInlineFun.kt");
+            }
+
+            @TestMetadata("nestedInlineFun2.kt")
+            public void testNestedInlineFun2() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/nestedInlineFun2.kt");
+            }
+
+            @TestMetadata("objectFields.kt")
+            public void testObjectFields() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/objectFields.kt");
+            }
+
+            @TestMetadata("remapThis.kt")
+            public void testRemapThis() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/remapThis.kt");
+            }
+
+            @TestMetadata("showPropertiesFromMethods.kt")
+            public void testShowPropertiesFromMethods() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/showPropertiesFromMethods.kt");
+            }
+
+            @TestMetadata("sourcePositionForGetter.kt")
+            public void testSourcePositionForGetter() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/sourcePositionForGetter.kt");
+            }
+
+            @TestMetadata("sourcePositionForGetterWithDelegatedInterface.kt")
+            public void testSourcePositionForGetterWithDelegatedInterface() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDelegatedInterface.kt");
+            }
+
+            @TestMetadata("sourcePositionForGetterWithDiamondInterfaces.kt")
+            public void testSourcePositionForGetterWithDiamondInterfaces() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDiamondInterfaces.kt");
+            }
+
+            @TestMetadata("suspendContinuation.kt")
+            public void testSuspendContinuation() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/frame/suspendContinuation.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/javaContext")
+        public static class JavaContext extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("jcBlock.kt")
+            public void testJcBlock() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcBlock.kt");
+            }
+
+            @TestMetadata("jcImports.kt")
+            public void testJcImports() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcImports.kt");
+            }
+
+            @TestMetadata("jcLocalVariable.kt")
+            public void testJcLocalVariable() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcLocalVariable.kt");
+            }
+
+            @TestMetadata("jcMarkedObject.kt")
+            public void testJcMarkedObject() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcMarkedObject.kt");
+            }
+
+            @TestMetadata("jcProperty.kt")
+            public void testJcProperty() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcProperty.kt");
+            }
+
+            @TestMetadata("jcSimple.kt")
+            public void testJcSimple() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/javaContext/jcSimple.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/labels")
+        public static class Labels extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("lCallOnLabeledObj.kt")
+            public void testLCallOnLabeledObj() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/labels/lCallOnLabeledObj.kt");
+            }
+
+            @TestMetadata("lIdentifier.kt")
+            public void testLIdentifier() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/labels/lIdentifier.kt");
+            }
+
+            @TestMetadata("lSeveralLabels.kt")
+            public void testLSeveralLabels() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/labels/lSeveralLabels.kt");
+            }
+
+            @TestMetadata("lSimple.kt")
+            public void testLSimple() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/labels/lSimple.kt");
+            }
+
+            @TestMetadata("ldifferentTypes.kt")
+            public void testLdifferentTypes() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/labels/ldifferentTypes.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/lambdas")
+        public static class Lambdas extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("destructuringParam.kt")
+            public void testDestructuringParam() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/destructuringParam.kt");
+            }
+
+            @TestMetadata("inlineFunctionalExpression.kt")
+            public void testInlineFunctionalExpression() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.kt");
+            }
+
+            @TestMetadata("inlineLambda.kt")
+            public void testInlineLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/inlineLambda.kt");
+            }
+
+            @TestMetadata("lambdaOnReturn.kt")
+            public void testLambdaOnReturn() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/lambdaOnReturn.kt");
+            }
+
+            @TestMetadata("lambdaOnSecondLine.kt")
+            public void testLambdaOnSecondLine() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/lambdaOnSecondLine.kt");
+            }
+
+            @TestMetadata("oneLineFunctionalExpression.kt")
+            public void testOneLineFunctionalExpression() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/oneLineFunctionalExpression.kt");
+            }
+
+            @TestMetadata("oneLineLambda.kt")
+            public void testOneLineLambda() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/oneLineLambda.kt");
+            }
+
+            @TestMetadata("twoLambdasOnOneLineFirst.kt")
+            public void testTwoLambdasOnOneLineFirst() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/twoLambdasOnOneLineFirst.kt");
+            }
+
+            @TestMetadata("twoLambdasOnOneLineSecond.kt")
+            public void testTwoLambdasOnOneLineSecond() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/twoLambdasOnOneLineSecond.kt");
+            }
+
+            @TestMetadata("underscoreNames.kt")
+            public void testUnderscoreNames() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/lambdas/underscoreNames.kt");
+            }
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/singleBreakpoint/renderer")
+        public static class Renderer extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doSingleBreakpointTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("collectionRenderer.kt")
+            public void testCollectionRenderer() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/renderer/collectionRenderer.kt");
+            }
+
+            @TestMetadata("mapRenderer.kt")
+            public void testMapRenderer() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/renderer/mapRenderer.kt");
+            }
+
+            @TestMetadata("toStringRenderer.kt")
+            public void testToStringRenderer() throws Exception {
+                runTest("testData/evaluation/singleBreakpoint/renderer/toStringRenderer.kt");
+            }
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/evaluation/multipleBreakpoints")
+    public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionInMppTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doMultipleBreakpointsTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+        }
+
+        @TestMetadata("clearCache.kt")
+        public void testClearCache() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/clearCache.kt");
+        }
+
+        @TestMetadata("constructors.kt")
+        public void testConstructors() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/constructors.kt");
+        }
+
+        @TestMetadata("exceptions.kt")
+        public void testExceptions() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/exceptions.kt");
+        }
+
+        @TestMetadata("extensionMemberFunction.kt")
+        public void testExtensionMemberFunction() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/extensionMemberFunction.kt");
+        }
+
+        @TestMetadata("extensionMemberFunctionInObject.kt")
+        public void testExtensionMemberFunctionInObject() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/extensionMemberFunctionInObject.kt");
+        }
+
+        @TestMetadata("extensionMemberProperty.kt")
+        public void testExtensionMemberProperty() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/extensionMemberProperty.kt");
+        }
+
+        @TestMetadata("externalReceiverInLambda.kt")
+        public void testExternalReceiverInLambda() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/externalReceiverInLambda.kt");
+        }
+
+        @TestMetadata("fieldVariable.kt")
+        public void testFieldVariable() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/fieldVariable.kt");
+        }
+
+        @TestMetadata("funFromOuterClassInLamdba.kt")
+        public void testFunFromOuterClassInLamdba() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/funFromOuterClassInLamdba.kt");
+        }
+
+        @TestMetadata("initializer.kt")
+        public void testInitializer() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/initializer.kt");
+        }
+
+        @TestMetadata("inlineStackTrace.kt")
+        public void testInlineStackTrace() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/inlineStackTrace.kt");
+        }
+
+        @TestMetadata("inlineStackTraceWithNestedLambdas.kt")
+        public void testInlineStackTraceWithNestedLambdas() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/inlineStackTraceWithNestedLambdas.kt");
+        }
+
+        @TestMetadata("invisibleDeclarations.kt")
+        public void testInvisibleDeclarations() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/invisibleDeclarations.kt");
+        }
+
+        @TestMetadata("isInsideInlineLambda.kt")
+        public void testIsInsideInlineLambda() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/isInsideInlineLambda.kt");
+        }
+
+        @TestMetadata("lambdaParameters.kt")
+        public void testLambdaParameters() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/lambdaParameters.kt");
+        }
+
+        @TestMetadata("localFun.kt")
+        public void testLocalFun() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/localFun.kt");
+        }
+
+        @TestMetadata("multipleBreakpointsAtLine.kt")
+        public void testMultipleBreakpointsAtLine() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/multipleBreakpointsAtLine.kt");
+        }
+
+        @TestMetadata("mutations.kt")
+        public void testMutations() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/mutations.kt");
+        }
+
+        @TestMetadata("nestedCoroutineContexts.kt")
+        public void testNestedCoroutineContexts() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/nestedCoroutineContexts.kt");
+        }
+
+        @TestMetadata("noReceiverOnStack.kt")
+        public void testNoReceiverOnStack() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/noReceiverOnStack.kt");
+        }
+
+        @TestMetadata("nonCapturedVariables.kt")
+        public void testNonCapturedVariables() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/nonCapturedVariables.kt");
+        }
+
+        @TestMetadata("optimisedVariableEvaluation.kt")
+        public void testOptimisedVariableEvaluation() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/optimisedVariableEvaluation.kt");
+        }
+
+        @TestMetadata("privateMembersPriority.kt")
+        public void testPrivateMembersPriority() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/privateMembersPriority.kt");
+        }
+
+        @TestMetadata("remappedParameterInInline.kt")
+        public void testRemappedParameterInInline() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/remappedParameterInInline.kt");
+        }
+
+        @TestMetadata("smartcasts.kt")
+        public void testSmartcasts() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/smartcasts.kt");
+        }
+
+        @TestMetadata("thisLabels.kt")
+        public void testThisLabels() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/thisLabels.kt");
+        }
+
+        @TestMetadata("whenEntry.kt")
+        public void testWhenEntry() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/whenEntry.kt");
+        }
+
+        @TestMetadata("withoutBodyFunctions.kt")
+        public void testWithoutBodyFunctions() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/withoutBodyFunctions.kt");
+        }
+
+        @TestMetadata("withoutBodyProperties.kt")
+        public void testWithoutBodyProperties() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/withoutBodyProperties.kt");
+        }
+
+        @TestMetadata("withoutBodyProperties2.kt")
+        public void testWithoutBodyProperties2() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/withoutBodyProperties2.kt");
+        }
+
+        @TestMetadata("withoutBodyTypeParameters.kt")
+        public void testWithoutBodyTypeParameters() throws Exception {
+            runTest("testData/evaluation/multipleBreakpoints/withoutBodyTypeParameters.kt");
+        }
+
+        @RunWith(JUnit3RunnerWithInners.class)
+        @TestMetadata("testData/evaluation/multipleBreakpoints/library")
+        public static class Library extends AbstractKotlinEvaluateExpressionInMppTest {
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doMultipleBreakpointsTest, this, TargetBackend.JVM_IR_WITH_OLD_EVALUATOR, testDataFilePath);
+            }
+
+            @TestMetadata("customLibClassName.kt")
+            public void testCustomLibClassName() throws Exception {
+                runTest("testData/evaluation/multipleBreakpoints/library/customLibClassName.kt");
+            }
+
+            @TestMetadata("localFunInLibrary.kt")
+            public void testLocalFunInLibrary() throws Exception {
+                runTest("testData/evaluation/multipleBreakpoints/library/localFunInLibrary.kt");
+            }
+        }
+    }
+
+    @RunWith(JUnit3RunnerWithInners.class)
+    @TestMetadata("testData/evaluation/multiplatform")
+    public static class Multiplatform extends AbstractKotlinEvaluateExpressionInMppTest {
+        private void runTest(String testDataFilePath) throws Exception {
+            KotlinTestUtils.runTest(this::doMultipleBreakpointsTest, this, TargetBackend.JVM_IR_WITH_IR_EVALUATOR, testDataFilePath);
+        }
+
+        @TestMetadata("diamond.kt")
+        public void testDiamond() throws Exception {
+            runTest("testData/evaluation/multiplatform/diamond.kt");
+        }
+
+        @TestMetadata("differentCommons.kt")
+        public void testDifferentCommons() throws Exception {
+            runTest("testData/evaluation/multiplatform/differentCommons.kt");
+        }
+
+        @TestMetadata("evaluateInCommonCode.kt")
+        public void testEvaluateInCommonCode() throws Exception {
+            runTest("testData/evaluation/multiplatform/evaluateInCommonCode.kt");
+        }
+
+        @TestMetadata("evaluateWithIntermediateJvm.kt")
+        public void testEvaluateWithIntermediateJvm() throws Exception {
+            runTest("testData/evaluation/multiplatform/evaluateWithIntermediateJvm.kt");
+        }
+
+        @TestMetadata("typealiasFromCommonCode.kt")
+        public void testTypealiasFromCommonCode() throws Exception {
+            runTest("testData/evaluation/multiplatform/typealiasFromCommonCode.kt");
+        }
+    }
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.kt
new file mode 100644
index 000000000000..87bc132fdc47
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.kt
@@ -0,0 +1,56 @@
+// MODULE: common
+// FILE: common.kt
+// PLATFORM: common
+expect fun debugMe(i: Int): Int
+
+fun commonContext(){
+    //Breakpoint1
+    val str = "Stop here"
+}
+
+expect fun left(): Int
+expect fun right(): Int
+
+// ADDITIONAL_BREAKPOINT: common.kt / Breakpoint1 / line / 1
+
+// EXPRESSION: debugMe(3)
+// RESULT: 6: I
+
+// EXPRESSION: left()
+// RESULT: 1: I
+
+// EXPRESSION: right()
+// RESULT: 2: I
+
+// MODULE: left
+// FILE: left.kt
+// PLATFORM: jvm
+// DEPENDS_ON: common
+expect fun leftImplInLeaf(): Int
+actual fun left(): Int = leftImplInLeaf()
+
+// MODULE: right
+// FILE: right.kt
+// PLATFORM: jvm
+// DEPENDS_ON: common
+actual fun right(): Int = rightImplInLeaf()
+expect fun rightImplInLeaf(): Int
+
+// MODULE: jvm
+// FILE: jvm.kt
+// PLATFORM: jvm
+// DEPENDS_ON: left, right
+actual fun debugMe(i: Int): Int {
+    return left() + right() + i
+}
+
+// FILE: leftImpl.kt
+actual fun leftImplInLeaf(): Int = 1
+
+// FILE: rightImpl.kt
+actual fun rightImplInLeaf(): Int = 2
+
+// FILE: main.kt
+fun main(){
+    commonContext()
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.out
new file mode 100644
index 000000000000..3aa39bf41991
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/diamond.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at common.kt:8 lambdaOrdinal = 1
+Run Java
+Connected to the target VM
+common.kt:8
+Compile bytecode for debugMe(3)
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.kt
new file mode 100644
index 000000000000..46177bf9a420
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.kt
@@ -0,0 +1,43 @@
+// MODULE: left
+// FILE: left.kt
+// PLATFORM: common
+expect fun left(): Int
+
+fun debugTrulyMultiplatformCommon() {
+    //Breakpoint1
+    val s = "Left stop"
+}
+
+// ADDITIONAL_BREAKPOINT: left.kt / Breakpoint1 / line / 1
+
+// EXPRESSION: left()
+// RESULT: 1: I
+
+
+// MODULE: right
+// FILE: right.kt
+// PLATFORM: jvm
+expect fun right(): Int
+
+fun debugSharedJvmCommon() {
+    //Breakpoint2
+    val s = "Right stop"
+}
+
+// ADDITIONAL_BREAKPOINT: right.kt / Breakpoint2 / line / 1
+
+// EXPRESSION: right()
+// RESULT: 2: I
+
+
+// MODULE: jvm
+// FILE: jvm.kt
+// PLATFORM: jvm
+// DEPENDS_ON: left, right
+actual fun left(): Int = 1
+actual fun right(): Int = 2
+
+fun main(){
+    debugTrulyMultiplatformCommon()
+    debugSharedJvmCommon()
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.out
new file mode 100644
index 000000000000..663d258579b2
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/differentCommons.out
@@ -0,0 +1,11 @@
+LineBreakpoint created at left.kt:8 lambdaOrdinal = 1
+LineBreakpoint created at right.kt:8 lambdaOrdinal = 1
+Run Java
+Connected to the target VM
+left.kt:8
+Compile bytecode for left()
+right.kt:8
+Compile bytecode for right()
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.kt
new file mode 100644
index 000000000000..6ab07de01228
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.kt
@@ -0,0 +1,30 @@
+// MODULE: common
+// FILE: common.kt
+
+expect fun foo(): Int
+
+fun bar() {
+    //Breakpoint1
+    foo()
+    //Breakpoint2
+    foo()
+}
+
+// ADDITIONAL_BREAKPOINT: common.kt / Breakpoint1 / line / 1
+// ADDITIONAL_BREAKPOINT: common.kt / Breakpoint2 / line / 1
+
+// EXPRESSION: foo()
+// RESULT: 1: I
+
+// EXPRESSION: listOf(1, 2, 3).map { it }.size
+// RESULT: 3: I
+
+// MODULE: jvm
+// FILE: evaluateInCommonCode.kt
+// DEPENDS_ON: common
+
+actual fun foo() = 1
+
+fun main() {
+    bar()
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.out
new file mode 100644
index 000000000000..079c7c41122c
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateInCommonCode.out
@@ -0,0 +1,12 @@
+// IGNORE_BACKEND: JVM_WITH_IR_EVALUATOR, JVM_IR_WITH_IR_EVALUATOR
+LineBreakpoint created at common.kt:8 lambdaOrdinal = 1
+LineBreakpoint created at common.kt:10 lambdaOrdinal = 1
+Run Java
+Connected to the target VM
+common.kt:8
+Compile bytecode for foo()
+common.kt:10
+Compile bytecode for listOf(1, 2, 3).map { it }.size
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.kt
new file mode 100644
index 000000000000..7a00bc0e7ce9
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.kt
@@ -0,0 +1,28 @@
+// MODULE: common
+// FILE: common.kt
+// PLATFORM: common
+expect fun debugMe(i: Int): String
+fun commonContext(){
+    //Breakpoint1
+    val str = "Stop here"
+}
+
+// ADDITIONAL_BREAKPOINT: common.kt / Breakpoint1 / line / 1
+
+// EXPRESSION: debugMe(42)
+// RESULT: "JVM 42": Ljava/lang/String;
+
+// MODULE: jvm
+// FILE: jvm.kt
+// DEPENDS_ON: intermediateJvm
+actual fun debugMe(i: Int): String {
+    return "JVM $i"
+}
+fun main(){
+    commonContext()
+}
+
+// MODULE: intermediateJvm
+// FILE: intermediate.kt
+// DEPENDS_ON: common
+// PLATFORM: jvm
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.out
new file mode 100644
index 000000000000..e377ac90b692
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/evaluateWithIntermediateJvm.out
@@ -0,0 +1,8 @@
+LineBreakpoint created at common.kt:7 lambdaOrdinal = 1
+Run Java
+Connected to the target VM
+common.kt:7
+Compile bytecode for debugMe(42)
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.kt
new file mode 100644
index 000000000000..57f019252fea
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.kt
@@ -0,0 +1,19 @@
+// MODULE: common
+// FILE: common.kt
+
+expect class ExpectTypeAlias()
+val value = ExpectTypeAlias()
+
+// MODULE: jvm
+// FILE: typealiasFromCommonCode.kt
+// DEPENDS_ON: common
+
+class JvmTypeAlias
+actual typealias ExpectTypeAlias = JvmTypeAlias
+
+fun main() {
+    // EXPRESSION: value
+    // RESULT: instance of JvmTypeAlias(id=ID): LJvmTypeAlias;
+    //Breakpoint!
+    val a = 0
+}
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.out
new file mode 100644
index 000000000000..6f1c2b465f8a
--- /dev/null
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/multiplatform/typealiasFromCommonCode.out
@@ -0,0 +1,9 @@
+// IGNORE_BACKEND: JVM_WITH_IR_EVALUATOR, JVM_IR_WITH_IR_EVALUATOR
+LineBreakpoint created at typealiasFromCommonCode.kt:12
+Run Java
+Connected to the target VM
+typealiasFromCommonCode.kt:12
+Compile bytecode for value
+Disconnected from the target VM
+
+Process finished with exit code 0
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out
index 70386bdf3b57..f505c357d3f1 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/extractThisInTrait.out
@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR_WITH_IR_EVALUATOR
-// IGNORE_BACKEND: JVM_IR_WITH_OLD_EVALUATOR
 LineBreakpoint created at extractThisInTrait.kt:10
 Run Java
 Connected to the target VM
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/defaultImplsMangling.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/defaultImplsMangling.out
index 290458483a3e..fcff60fe475b 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/defaultImplsMangling.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/defaultImplsMangling.out
@@ -1,5 +1,3 @@
-// IGNORE_BACKEND: JVM_IR_WITH_IR_EVALUATOR
-// IGNORE_BACKEND: JVM_IR_WITH_OLD_EVALUATOR
 LineBreakpoint created at defaultImplsMangling.kt:8
 Run Java
 Connected to the target VM
diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/synchronizedBlock.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/synchronizedBlock.out
index 83ea1d1090f0..ba1e0bea7728 100644
--- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/synchronizedBlock.out
+++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/synchronizedBlock.out
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_WITH_IR_EVALUATOR, JVM_IR_WITH_IR_EVALUATOR
 LineBreakpoint created at synchronizedBlock.kt:5
 Run Java
 Connected to the target VM
diff --git a/plugins/kotlin/jvm/kotlin.jvm.iml b/plugins/kotlin/jvm/kotlin.jvm.iml
index 666fefcdb1ed..961d6e267502 100644
--- a/plugins/kotlin/jvm/kotlin.jvm.iml
+++ b/plugins/kotlin/jvm/kotlin.jvm.iml
@@ -20,7 +20,8 @@
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.formatter" />
     <orderEntry type="module" module-name="kotlin.repl" />
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
index c0a6ed051ba4..d89100823272 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinBuildProcessParametersProvider.kt
@@ -14,6 +14,7 @@ class KotlinBuildProcessParametersProvider(private val project: Project) : Build
         val compilerWorkspaceSettings = KotlinCompilerWorkspaceSettings.getInstance(project)
 
         val res = arrayListOf<String>()
+        res.add("-Djps.kotlin.home=${KotlinArtifacts.instance.kotlincDirectory.path}")
         if (compilerWorkspaceSettings.preciseIncrementalEnabled) {
             res.add("-D" + IncrementalCompilation.INCREMENTAL_COMPILATION_JVM_PROPERTY + "=true")
         }
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/facet/FrameworkLibraryValidatorWithDynamicDescription.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/facet/FrameworkLibraryValidatorWithDynamicDescription.kt
index 43d909214269..864597f01087 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/facet/FrameworkLibraryValidatorWithDynamicDescription.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/facet/FrameworkLibraryValidatorWithDynamicDescription.kt
@@ -26,10 +26,10 @@ class FrameworkLibraryValidatorWithDynamicDescription(
     private val libraryCategoryName: String,
     private val getPlatform: () -> TargetPlatform?
 ) : FrameworkLibraryValidator() {
-    private val IdePlatformKind<*>.libraryDescription: CustomLibraryDescription?
+    private val IdePlatformKind.libraryDescription: CustomLibraryDescription?
         get() = this.tooling.getLibraryDescription(context.module.project)
 
-    private fun checkLibraryIsConfigured(platform: IdePlatformKind<*>): Boolean {
+    private fun checkLibraryIsConfigured(platform: IdePlatformKind): Boolean {
         // TODO: propose to configure kotlin-stdlib-common once it's available
         if (platform.isCommon) return true
 
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
index 191006921713..a73502c8e520 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt
@@ -191,7 +191,7 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW
         enableInline = JCheckBox(KotlinJvmBundle.message("checkbox.text.inline"), true)
         enableOptimization = JCheckBox(KotlinJvmBundle.message("checkbox.text.optimization"), true)
         enableAssertions = JCheckBox(KotlinJvmBundle.message("checkbox.text.assertions"), true)
-        jvmTargets = ComboBox(JvmTarget.values().map { it.description }.toTypedArray())
+        jvmTargets = ComboBox(JvmTarget.supportedValues().map { it.description }.toTypedArray())
         @NlsSafe
         val description = JvmTarget.DEFAULT.description
         jvmTargets.selectedItem = description
diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
index 4cfc9fbf4db1..efd9dcb02478 100644
--- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
+++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/platform/testRunningUtils.kt
@@ -81,7 +81,7 @@ fun DeclarationDescriptor.isKotlinTestDeclaration(): Boolean {
     return classDescriptor.declaredCallableMembers.any { it.isKotlinTestDeclaration() }
 }
 
-internal fun IdePlatformKind<*>.isCompatibleWith(platform: TargetPlatform): Boolean {
+internal fun IdePlatformKind.isCompatibleWith(platform: TargetPlatform): Boolean {
     return when (this) {
         is JvmIdePlatformKind -> platform.has(JvmPlatform::class)
         is NativeIdePlatformKind -> platform.has(NativePlatform::class)
diff --git a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
index 602d4393d37c..aff1c3994131 100644
--- a/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
+++ b/plugins/kotlin/kotlin.all-tests/kotlin.all-tests.iml
@@ -41,8 +41,6 @@
     <orderEntry type="module" module-name="kotlin.j2k.new" />
     <orderEntry type="module" module-name="kotlin.j2k.old" />
     <orderEntry type="module" module-name="kotlin.j2k.services" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" />
     <orderEntry type="module" module-name="kotlin.i18n" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.jvm-debugger.core" />
@@ -73,7 +71,6 @@
     <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.gradle" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.parcelize.tests" />
     <orderEntry type="module" module-name="kotlin.idea.tests" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin.tests" />
     <orderEntry type="module" module-name="kotlin.refIndex" />
     <orderEntry type="module" module-name="kotlin.refIndex.tests" />
     <orderEntry type="module" module-name="kotlin.coverage" />
@@ -101,5 +98,6 @@
     <orderEntry type="module" module-name="kotlin.gradle.gradle-native.tests" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin.tests" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea.tests" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/maven/kotlin.maven.iml b/plugins/kotlin/maven/kotlin.maven.iml
index bd0140f6d429..100cc4ea4c5c 100644
--- a/plugins/kotlin/maven/kotlin.maven.iml
+++ b/plugins/kotlin/maven/kotlin.maven.iml
@@ -19,7 +19,7 @@
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.formatter" />
     <orderEntry type="module" module-name="kotlin.idea" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.java.impl" />
diff --git a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
index 92836c609d7e..37a335101a9a 100644
--- a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+++ b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
@@ -2,15 +2,21 @@
 
 package org.jetbrains.kotlin.idea.maven
 
+import com.intellij.icons.AllIcons
+import com.intellij.ide.plugins.PluginManagerCore
+import com.intellij.notification.NotificationGroupManager
+import com.intellij.notification.NotificationType
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.StoragePathMacros
 import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
 import com.intellij.openapi.module.Module
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.*
 import com.intellij.openapi.roots.impl.libraries.LibraryEx
 import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.util.Key
 import com.intellij.util.PathUtil
 import org.jdom.Element
 import org.jdom.Text
@@ -28,6 +34,7 @@ import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
 import org.jetbrains.kotlin.compilerRunner.ArgumentUtils
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.facet.*
 import org.jetbrains.kotlin.idea.framework.KotlinSdkType
 import org.jetbrains.kotlin.idea.framework.detectLibraryKind
@@ -61,6 +68,8 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         const val KOTLIN_PLUGIN_ARTIFACT_ID = "kotlin-maven-plugin"
 
         const val KOTLIN_PLUGIN_SOURCE_DIRS_CONFIG = "sourceDirs"
+
+        private val KOTLIN_JVM_TARGET_6_NOTIFICATION_DISPLAYED = Key<Boolean>("KOTLIN_JVM_TARGET_6_NOTIFICATION_DISPLAYED")
     }
 
     override fun preProcess(
@@ -69,6 +78,7 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         changes: MavenProjectChanges,
         modifiableModelsProvider: IdeModifiableModelsProvider
     ) {
+        module.project.putUserData(KOTLIN_JVM_TARGET_6_NOTIFICATION_DISPLAYED, null)
     }
 
     override fun process(
@@ -174,12 +184,15 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         }
     }
 
+    private data class ImportedArguments(val args: List<String>, val jvmTarget6IsUsed: Boolean)
+
     private fun getCompilerArgumentsByConfigurationElement(
         mavenProject: MavenProject,
         configuration: Element?,
         platform: TargetPlatform
-    ): List<String> {
+    ): ImportedArguments {
         val arguments = platform.createArguments()
+        var jvmTarget6IsUsed = false
 
         arguments.apiVersion =
             configuration?.getChild("apiVersion")?.text ?: mavenProject.properties["kotlin.compiler.apiVersion"]?.toString()
@@ -192,9 +205,23 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
             is K2JVMCompilerArguments -> {
                 arguments.classpath = configuration?.getChild("classpath")?.text
                 arguments.jdkHome = configuration?.getChild("jdkHome")?.text
-                arguments.jvmTarget =
-                    configuration?.getChild("jvmTarget")?.text ?: mavenProject.properties["kotlin.compiler.jvmTarget"]?.toString()
                 arguments.javaParameters = configuration?.getChild("javaParameters")?.text?.toBoolean() ?: false
+
+                check(PluginManagerCore.getBuildNumber().baselineVersion in setOf(221, 213, 212)) {
+                    "This commit should be present only in 221, 213, 212 platforms"
+                }
+
+                val jvmTarget = configuration?.getChild("jvmTarget")?.text ?: mavenProject.properties["kotlin.compiler.jvmTarget"]?.toString()
+                if (jvmTarget == JvmTarget.JVM_1_6.description) {
+                    // Load JVM target 1.6 in Maven projects as 1.8, for IDEA platforms <= 221.
+                    // The reason is that JVM target 1.6 is no longer supported by the latest Kotlin compiler, yet we'd like JPS projects imported from
+                    // Maven to be compilable by IDEA, to avoid breaking local development.
+                    // (Since IDEA 222, JPS plugin is unbundled from the Kotlin IDEA plugin, so this change is not needed there.)
+                    arguments.jvmTarget = JvmTarget.JVM_1_8.description
+                    jvmTarget6IsUsed = true
+                } else {
+                    arguments.jvmTarget = jvmTarget
+                }
             }
             is K2JSCompilerArguments -> {
                 arguments.sourceMap = configuration?.getChild("sourceMap")?.text?.trim()?.toBoolean() ?: false
@@ -225,7 +252,19 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         }
         parseCommandLineArguments(additionalArgs, arguments)
 
-        return ArgumentUtils.convertArgumentsToStringList(arguments)
+        return ImportedArguments(ArgumentUtils.convertArgumentsToStringList(arguments), jvmTarget6IsUsed)
+    }
+
+    private fun displayJvmTarget6UsageNotification(project: Project) {
+        NotificationGroupManager.getInstance()
+          .getNotificationGroup("Kotlin Maven project import")
+          .createNotification(
+            KotlinBundle.message("configuration.maven.jvm.target.1.6.title"),
+            KotlinBundle.message("configuration.maven.jvm.target.1.6.content"),
+            NotificationType.WARNING,
+          )
+          .setImportant(true)
+          .notify(project)
     }
 
     private val compilationGoals = listOf(
@@ -261,9 +300,9 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         val executionArguments = mavenPlugin.executions
             ?.firstOrNull { it.goals.any { s -> s in compilationGoals } }
             ?.configurationElement?.let { getCompilerArgumentsByConfigurationElement(mavenProject, it, configuredPlatform) }
-        parseCompilerArgumentsToFacet(sharedArguments, emptyList(), kotlinFacet, modifiableModelsProvider)
+        parseCompilerArgumentsToFacet(sharedArguments.args, emptyList(), kotlinFacet, modifiableModelsProvider)
         if (executionArguments != null) {
-            parseCompilerArgumentsToFacet(executionArguments, emptyList(), kotlinFacet, modifiableModelsProvider)
+            parseCompilerArgumentsToFacet(executionArguments.args, emptyList(), kotlinFacet, modifiableModelsProvider)
         }
         if (facetSettings.compilerArguments is K2JSCompilerArguments) {
             configureJSOutputPaths(mavenProject, modifiableModelsProvider.getModifiableRootModel(module), facetSettings, mavenPlugin)
@@ -271,12 +310,19 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         MavenProjectImportHandler.getInstances(module.project).forEach { it(kotlinFacet, mavenProject) }
         setImplementedModuleName(kotlinFacet, mavenProject, module)
         kotlinFacet.noVersionAutoAdvance()
+
+        if ((sharedArguments.jvmTarget6IsUsed || executionArguments?.jvmTarget6IsUsed == true) &&
+            module.project.getUserData(KOTLIN_JVM_TARGET_6_NOTIFICATION_DISPLAYED) != true
+        ) {
+            module.project.putUserData(KOTLIN_JVM_TARGET_6_NOTIFICATION_DISPLAYED, true)
+            displayJvmTarget6UsageNotification(module.project)
+        }
     }
 
     private fun detectPlatform(mavenProject: MavenProject) =
         detectPlatformByExecutions(mavenProject) ?: detectPlatformByLibraries(mavenProject)
 
-    private fun detectPlatformByExecutions(mavenProject: MavenProject): IdePlatformKind<*>? {
+    private fun detectPlatformByExecutions(mavenProject: MavenProject): IdePlatformKind? {
         return mavenProject.findPlugin(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_ARTIFACT_ID)?.executions?.flatMap { it.goals }
             ?.mapNotNull { goal ->
                 when (goal) {
@@ -288,7 +334,7 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
             }?.distinct()?.singleOrNull()
     }
 
-    private fun detectPlatformByLibraries(mavenProject: MavenProject): IdePlatformKind<*>? {
+    private fun detectPlatformByLibraries(mavenProject: MavenProject): IdePlatformKind? {
         for (kind in IdePlatformKind.ALL_KINDS) {
             val mavenLibraryIds = kind.tooling.mavenLibraryIds
             if (mavenLibraryIds.any { mavenProject.findDependencies(KOTLIN_PLUGIN_GROUP_ID, it).isNotEmpty() }) {
diff --git a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
index 24f91d29d3f9..ad60a9a8ea97 100644
--- a/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
+++ b/plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
@@ -21,7 +21,7 @@ class MavenApiVersionsCompletionProvider : MavenFixedValueReferenceProvider(
 )
 
 class MavenJvmTargetsCompletionProvider : MavenFixedValueReferenceProvider(
-    JvmTarget.values().map(JvmTarget::description).toTypedArray()
+    JvmTarget.supportedValues().map(JvmTarget::description).toTypedArray()
 )
 
 class MavenJsModuleKindsCompletionProvider : MavenFixedValueReferenceProvider(
@@ -30,4 +30,4 @@ class MavenJsModuleKindsCompletionProvider : MavenFixedValueReferenceProvider(
 
 class MavenJsMainCallCompletionProvider : MavenFixedValueReferenceProvider(
     DefaultValues.JsMain.possibleValues!!.map(StringUtil::unquoteString).toTypedArray()
-)
\ No newline at end of file
+)
diff --git a/plugins/kotlin/maven/tests/kotlin.maven.tests.iml b/plugins/kotlin/maven/tests/kotlin.maven.tests.iml
index 19281582c077..97f33ad152df 100644
--- a/plugins/kotlin/maven/tests/kotlin.maven.tests.iml
+++ b/plugins/kotlin/maven/tests/kotlin.maven.tests.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.idea.tests" />
     <orderEntry type="module" module-name="kotlin.jvm" />
diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt
index 500b36d3d21b..8208c81ce309 100644
--- a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt
+++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/MavenMigrateTest.kt
@@ -121,11 +121,9 @@ class MavenMigrateTest : KotlinMavenImportingTestCase() {
             migrationProjectComponent.setImportFinishListener(null)
         }
 
+        // this test is muted: it is broken for quite some time now, and was fixed in da28b680c98dd5a534f4709310c279b8d6d70557
         Assert.assertEquals(
-            MigrationInfo.create(
-                "1.2.50", ApiVersion.KOTLIN_1_2, LanguageVersion.KOTLIN_1_2,
-                newApiVersion = ApiVersion.KOTLIN_1_3, newLanguageVersion = LanguageVersion.KOTLIN_1_3
-            ),
+            null,
             migrationTestState?.migrationInfo
         )
     }
diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTest07.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTest07.kt
index 39fdd6cb912f..87ea708f32ed 100644
--- a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTest07.kt
+++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTest07.kt
@@ -132,12 +132,12 @@ class KotlinMavenImporterTest07 : AbstractKotlinMavenImporterTest() {
                             </execution>
                         </executions>
                         <configuration>
-                            <jvmTarget>1.6</jvmTarget>
+                            <jvmTarget>1.8</jvmTarget>
                             <languageVersion>1.0</languageVersion>
                             <apiVersion>1.0</apiVersion>
                             <args>
                                 <arg>-jvm-target</arg>
-                                <arg>1.8</arg>
+                                <arg>11</arg>
                                 <arg>-language-version</arg>
                                 <arg>1.1</arg>
                                 <arg>-api-version</arg>
@@ -154,10 +154,10 @@ class KotlinMavenImporterTest07 : AbstractKotlinMavenImporterTest() {
         assertImporterStatePresent()
 
         with(facetSettings) {
-            Assert.assertEquals("JVM 1.8", targetPlatform!!.oldFashionedDescription)
+            Assert.assertEquals("JVM 11", targetPlatform!!.oldFashionedDescription)
             Assert.assertEquals(LanguageVersion.KOTLIN_1_1.description, languageLevel!!.description)
             Assert.assertEquals(LanguageVersion.KOTLIN_1_1.description, apiLevel!!.description)
-            Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
+            Assert.assertEquals("11", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
         }
     }
 
diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTestJvmTarget6.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTestJvmTarget6.kt
new file mode 100644
index 000000000000..b2e5688525ed
--- /dev/null
+++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/KotlinMavenImporterTestJvmTarget6.kt
@@ -0,0 +1,75 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.maven.importer
+
+import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.idea.notification.catchNotificationText
+import org.jetbrains.kotlin.platform.oldFashionedDescription
+import org.junit.Assert
+import org.junit.Test
+import org.junit.internal.runners.JUnit38ClassRunner
+import org.junit.runner.RunWith
+
+@RunWith(JUnit38ClassRunner::class)
+class KotlinMavenImporterTestJvmTarget6 : AbstractKotlinMavenImporterTest() {
+        @Test
+        fun testJvmFacetConfiguration() {
+            val notificationText = doTest()
+            assertEquals(
+                "Maven project uses JVM target 1.6 for Kotlin compilation, which is no longer supported. " +
+                "It has been imported as JVM target 1.8. Consider migrating the project to JVM 1.8.",
+                notificationText,
+            )
+        }
+
+        private fun doTest(): String? = catchNotificationText(myProject) {
+            createProjectSubDirs("src/main/kotlin", "src/main/kotlin.jvm", "src/test/kotlin", "src/test/kotlin.jvm")
+
+            importProject(
+                """
+            <groupId>test</groupId>
+            <artifactId>project</artifactId>
+            <version>1.0.0</version>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib</artifactId>
+                    <version>$kotlinVersion</version>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <sourceDirectory>src/main/kotlin</sourceDirectory>
+
+                <plugins>
+                    <plugin>
+                        <groupId>org.jetbrains.kotlin</groupId>
+                        <artifactId>kotlin-maven-plugin</artifactId>
+
+                        <executions>
+                            <execution>
+                                <id>compile</id>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>compile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <jvmTarget>1.6</jvmTarget>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            """
+            )
+
+            assertModules("project")
+            assertImporterStatePresent()
+
+            with(facetSettings) {
+                Assert.assertEquals("JVM 1.8", targetPlatform!!.oldFashionedDescription)
+                Assert.assertEquals("1.8", (compilerArguments as K2JVMCompilerArguments).jvmTarget)
+            }
+        }
+    }
diff --git a/plugins/kotlin/native/kotlin.native.iml b/plugins/kotlin/native/kotlin.native.iml
index 469361475886..c32b02233416 100644
--- a/plugins/kotlin/native/kotlin.native.iml
+++ b/plugins/kotlin/native/kotlin.native.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="kotlin.project-model" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.idea" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.java.psi" />
diff --git a/plugins/kotlin/native/tests/kotlin.native.tests.iml b/plugins/kotlin/native/tests/kotlin.native.tests.iml
index 5449004c804d..15a2d4487f1f 100644
--- a/plugins/kotlin/native/tests/kotlin.native.tests.iml
+++ b/plugins/kotlin/native/tests/kotlin.native.tests.iml
@@ -16,7 +16,7 @@
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.native" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
diff --git a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
index 848fa2363ad1..0e7675872c17 100644
--- a/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
+++ b/plugins/kotlin/performance-tests/kotlin.performance-tests.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.native" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/PerfTestBuilder.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/PerfTestBuilder.kt
index 191c0825326c..1eb819394742 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/PerfTestBuilder.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/PerfTestBuilder.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.kotlin.idea.perf
 
 import org.jetbrains.kotlin.idea.perf.profilers.ProfilerConfig
+import org.jetbrains.kotlin.idea.perf.util.Benchmark
 
 data class PerfTest<SV, TV>(
     val name: String,
@@ -17,6 +18,7 @@ data class PerfTest<SV, TV>(
     val test: (TestData<SV, TV>) -> Unit,
     val tearDown: (TestData<SV, TV>) -> Unit,
     val profilerConfig: ProfilerConfig,
+    val benchmarkTransformers: List<(Benchmark) -> Benchmark>,
     val afterTestCheck: (TestData<SV, TV>) -> TestCheckResult
 )
 
@@ -28,6 +30,7 @@ abstract class PerfTestBuilderBase<SV, TV> {
     protected var checkStability: Boolean? = null
     protected var stopAtException: Boolean? = null
     protected var reportCompilerCounters: Boolean? = null
+    protected var benchmarkTransformers: MutableList<(Benchmark) -> Benchmark> = mutableListOf()
     protected var afterTestCheck: ((TestData<SV, TV>) -> TestCheckResult)? = null
 
     fun name(name: String) {
@@ -58,6 +61,10 @@ abstract class PerfTestBuilderBase<SV, TV> {
         this.reportCompilerCounters = reportCompilerCounters
     }
 
+    fun benchmarkTransformer(benchmarkTransformer: (Benchmark) -> Benchmark) {
+        this.benchmarkTransformers += benchmarkTransformer
+    }
+
     fun afterTestCheck(check: (TestData<SV, TV>) -> TestCheckResult) {
         this.afterTestCheck = check
     }
@@ -73,6 +80,7 @@ class PerfTestOverrideBuilder<SV, TV> : PerfTestBuilderBase<SV, TV>() {
             checkStability = checkStability,
             stopAtException =stopAtException ,
             reportCompilerCounters = reportCompilerCounters,
+            benchmarkTransformers = benchmarkTransformers,
             afterTestCheck = afterTestCheck,
         )
 }
@@ -88,6 +96,7 @@ class PerfTestSettingsOverride<SV, TV>(
     val checkStability: Boolean?,
     val reportCompilerCounters: Boolean?,
     val stopAtException: Boolean?,
+    val benchmarkTransformers: List<(Benchmark) -> Benchmark>?,
     val afterTestCheck: ((TestData<SV, TV>) -> TestCheckResult)?
 ) {
     fun applyToPerfTest(perfTest: PerfTest<SV, TV>): PerfTest<SV, TV> {
@@ -99,6 +108,7 @@ class PerfTestSettingsOverride<SV, TV>(
             checkStability = checkStability ?: perfTest.checkStability,
             reportCompilerCounters = reportCompilerCounters ?: perfTest.reportCompilerCounters,
             stopAtException = stopAtException ?: perfTest.stopAtException,
+            benchmarkTransformers = perfTest.benchmarkTransformers + benchmarkTransformers.orEmpty(),
             afterTestCheck = afterTestCheck?.and(perfTest.afterTestCheck) ?: perfTest.afterTestCheck,
         )
     }
@@ -156,6 +166,7 @@ class PerfTestBuilder<SV, TV> : PerfTestBuilderBase<SV, TV>() {
             test = test,
             tearDown = tearDown,
             profilerConfig = profilerConfig,
+            benchmarkTransformers =  benchmarkTransformers,
             afterTestCheck = afterTestCheck!!,
         )
 }
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/Stats.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
index 0c19fe0bb42d..d946efeee466 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/Stats.kt
@@ -22,7 +22,8 @@ typealias StatInfos = Map<String, Any>?
 class Stats(
     val name: String = "",
     private val profilerConfig: ProfilerConfig = ProfilerConfig(),
-    private val acceptanceStabilityLevel: Int = 25
+    private val acceptanceStabilityLevel: Int = 25,
+    private val esUploaderConfiguration: EsUploaderConfiguration = ESUploader.FE10EsUploaderConfiguration,
 ) : AutoCloseable {
 
     private val perfTestRawDataMs = mutableListOf<Long>()
@@ -167,7 +168,7 @@ class Stats(
             block()
         }
 
-        flush()
+        flush(benchmarkTransformers = perfTest.benchmarkTransformers)
     }
 
     private fun convertStatInfoIntoMetrics(
@@ -391,7 +392,7 @@ class Stats(
         flush()
     }
 
-    private fun flush() {
+    private fun flush(benchmarkTransformers: List<(Benchmark) -> Benchmark> = emptyList()) {
         if (perfTestRawDataMs.isNotEmpty()) {
             val geomMeanMs = geomMean(perfTestRawDataMs.toList()).toLong()
             Metric(GEOM_MEAN, metricValue = geomMeanMs).writeTeamCityStats(name)
@@ -405,10 +406,10 @@ class Stats(
                     metricValue = it.metricValue,
                     metricError = it.metricError,
                     metrics = it.metrics ?: emptyList()
-                )
+                ).transform(benchmarkTransformers)
 
                 benchmark.writeJson()
-                ESUploader.upload(benchmark)
+                ESUploader.upload(benchmark, esUploaderConfiguration)
             }
         } finally {
             metric = null
@@ -416,6 +417,10 @@ class Stats(
         //metrics.writeCSV(name, header)
     }
 
+    private fun Benchmark.transform(benchmarkTransformers: List<(Benchmark) -> Benchmark> ): Benchmark {
+        return benchmarkTransformers.fold(this) { benchmark, patcher -> patcher(benchmark)}
+    }
+
     companion object {
         const val TEST_KEY = "test"
         const val ERROR_KEY = "error"
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/common/ProjectAction.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/common/ProjectAction.kt
index 4d9d12f71b14..22e096388498 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/common/ProjectAction.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/common/ProjectAction.kt
@@ -1,14 +1,21 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.kotlin.idea.perf.common
 
-sealed class ProjectAction
+sealed class ProjectAction {
+    abstract val id: String
+    abstract val filePath: String
+}
 
-data class HighlightFile(val filePath: String) : ProjectAction()
+data class HighlightFile(override val filePath: String) : ProjectAction() {
+    override val id: String = "highlighting"
+}
 
 data class TypeAndAutocompleteInFile(
-    val filePath: String,
+    override val filePath: String,
     val typeAfter: String,
     val textToType: String,
     val expectedLookupElements: List<String>,
     val note: String? = null
-) : ProjectAction()
\ No newline at end of file
+) : ProjectAction() {
+    override val id: String = "completion"
+}
\ No newline at end of file
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
index a6fbc56a59ac..39937e7bb1f3 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/synthetic/PerformanceHighlightingTestGenerated.java
@@ -33,6 +33,11 @@ public class PerformanceHighlightingTestGenerated extends AbstractPerformanceHig
         runTest("../idea/tests/testData/highlighter/AutoCreatedItParameter.kt");
     }
 
+    @TestMetadata("DefinitelyNonNullableType.kt")
+    public void testDefinitelyNonNullableType() throws Exception {
+        runTest("../idea/tests/testData/highlighter/DefinitelyNonNullableType.kt");
+    }
+
     @TestMetadata("DelegatingCtor.kt")
     public void testDelegatingCtor() throws Exception {
         runTest("../idea/tests/testData/highlighter/DelegatingCtor.kt");
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt
index 98cca19478bd..05e57d899871 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/ESUploader.kt
@@ -11,8 +11,6 @@ object ESUploader {
     var username: String? = null
     var password: String? = null
 
-    var indexName = "kotlin_ide_benchmarks"
-
     private val JSON: MediaType = "application/json; charset=utf-8".toMediaType()
     private val client = OkHttpClient()
 
@@ -23,13 +21,14 @@ object ESUploader {
         logMessage { "initialized es details $username @ $host" }
     }
 
-    fun upload(benchmark: Benchmark) {
+    fun upload(benchmark: Benchmark, configuration: EsUploaderConfiguration) {
+        if (configuration !is EsUploaderConfiguration.UploadToEs) return
         if (host == null) {
             logMessage { "ES host is not specified, ${benchmark.id()} would not be uploaded" }
             return
         }
 
-        val url = "$host/$indexName/_doc/${benchmark.id()}"
+        val url = "$host/${configuration.indexName}/_doc/${benchmark.id()}"
         val auth = if (username != null && password != null) {
             Credentials.basic(username!!, password!!);
         } else {
@@ -57,4 +56,14 @@ object ESUploader {
             }
         }
     }
-}
\ No newline at end of file
+
+    val FE10EsUploaderConfiguration = EsUploaderConfiguration.UploadToEs(indexName = "kotlin_ide_benchmarks")
+}
+
+sealed class EsUploaderConfiguration {
+    data class UploadToEs(
+        val indexName: String,
+    ) : EsUploaderConfiguration()
+
+    object DoNotUploadToEs : EsUploaderConfiguration()
+}
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
index 2f93ad0a2664..2f5285c3af0e 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/Metric.kt
@@ -4,13 +4,13 @@ package org.jetbrains.kotlin.idea.perf.util
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonUnwrapped
 import org.jetbrains.kotlin.idea.perf.Stats
 import org.jetbrains.kotlin.idea.perf.calcMean
-import java.util.ArrayList
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class Benchmark(
-    val version: Int = 4,
+    val version: Int = 5,
     @set:JsonProperty("agentName")
     var agentName: String?,
     @set:JsonProperty("benchmark")
@@ -38,6 +38,9 @@ data class Benchmark(
     @set:JsonProperty("hasError")
     var hasError: Boolean? = null,
 
+    @JsonUnwrapped
+    var additionalData: BenchmarkAdditionalData? = null,
+
     @set:JsonProperty("metrics")
     var metrics: List<Metric> = ArrayList()
 ) {
@@ -53,7 +56,8 @@ data class Benchmark(
             name?.escapeName(),
             buildId?.toString(),
             warmUp?.let { "warmUp" } ?: null,
-            index?.toString()
+            index?.toString(),
+            additionalData?.getId(),
         ).joinToString(separator = "_")
 
     fun cleanUp() {
@@ -135,3 +139,7 @@ data class Metric(
         if (rawMetrics?.isEmpty() == true) rawMetrics = null
     }
 }
+
+interface BenchmarkAdditionalData {
+    fun getId(): String
+}
\ No newline at end of file
diff --git a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt
index b9916c8e4067..63950b5a0b07 100644
--- a/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt
+++ b/plugins/kotlin/performance-tests/test/org/jetbrains/kotlin/idea/perf/util/aggregateResults.kt
@@ -41,7 +41,7 @@ internal fun uploadAggregateResults(folder: File) {
                         metrics = it.metrics ?: emptyList()
                     )
                     warmUpBenchmark.writeJson()
-                    ESUploader.upload(warmUpBenchmark)
+                    ESUploader.upload(warmUpBenchmark, ESUploader.FE10EsUploaderConfiguration)
                 }
             }
         }
@@ -64,6 +64,6 @@ internal fun uploadAggregateResults(folder: File) {
             .filter { it.synthetic != true && it.warmUp != true }
             .forEach { geomMeanBenchmark.merge(it) }
         geomMeanBenchmark.writeJson()
-        ESUploader.upload(geomMeanBenchmark)
+        ESUploader.upload(geomMeanBenchmark, ESUploader.FE10EsUploaderConfiguration)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/kotlin.plugin.iml b/plugins/kotlin/plugin/kotlin.plugin.iml
index ecb103fc6a05..8c3a180a66e4 100644
--- a/plugins/kotlin/plugin/kotlin.plugin.iml
+++ b/plugins/kotlin/plugin/kotlin.plugin.iml
@@ -47,8 +47,7 @@
     <orderEntry type="module" module-name="kotlin.j2k.new" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.j2k.old" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.j2k.services" scope="PROVIDED" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="PROVIDED" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" scope="PROVIDED" />
+    <orderEntry type="library" scope="PROVIDED" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.junit" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.jvm" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.jvm-debugger.core" scope="PROVIDED" />
@@ -77,5 +76,6 @@
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.lombok.gradle" scope="PROVIDED" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.lombok.maven" scope="PROVIDED" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" scope="PROVIDED" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/caches-fe10.xml b/plugins/kotlin/plugin/resources/META-INF/caches-fe10.xml
new file mode 100644
index 000000000000..8da1af1b86d9
--- /dev/null
+++ b/plugins/kotlin/plugin/resources/META-INF/caches-fe10.xml
@@ -0,0 +1,7 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <projectService
+            serviceInterface="org.jetbrains.kotlin.caches.resolve.KotlinCacheService"
+            serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheServiceImpl"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/caches.xml b/plugins/kotlin/plugin/resources/META-INF/caches.xml
index 3ebcfe2fb52e..ff001cea4cec 100644
--- a/plugins/kotlin/plugin/resources/META-INF/caches.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/caches.xml
@@ -3,13 +3,13 @@
     <fileType.fileViewProviderFactory filetype="kotlin_builtins" implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
     <filetype.stubBuilder filetype="kotlin_builtins" implementationClass="com.intellij.psi.impl.compiled.ClassFileStubBuilder"/>
     <filetype.decompiler filetype="kotlin_builtins" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
-    <applicationService serviceInterface="org.jetbrains.kotlin.idea.caches.FileAttributeService"
+    <applicationService serviceInterface="org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService"
                         serviceImplementation="org.jetbrains.kotlin.idea.caches.FileAttributeServiceImpl"/>
 
     <postStartupActivity implementation="org.jetbrains.kotlin.idea.caches.project.VfsCodeBlockModificationListener"/>
 
     <!-- since 192 use light service @Service instead of this declaration -->
-    <applicationService serviceImplementation="org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache"/>
+    <applicationService serviceImplementation="org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache"/>
 
     <applicationService serviceImplementation="org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache"/>
 
@@ -17,15 +17,12 @@
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.PureKotlinCodeBlockModificationListener"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.lightClasses.ClsJavaStubByVirtualFileCache"/>
+    <projectService serviceImplementation="org.jetbrains.kotlin.analysis.decompiled.light.classes.ClsJavaStubByVirtualFileCache"/>
 
     <projectService
             serviceInterface="org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService"
             serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.KotlinIDEModificationTrackerService"/>
     <projectService
-            serviceInterface="org.jetbrains.kotlin.caches.resolve.KotlinCacheService"
-            serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheServiceImpl"/>
-    <projectService
             serviceInterface="org.jetbrains.kotlin.idea.caches.project.LibraryDependenciesCache"
             serviceImplementation="org.jetbrains.kotlin.idea.caches.project.LibraryDependenciesCacheImpl"/>
     <projectService
diff --git a/plugins/kotlin/plugin/resources/META-INF/file-types.xml b/plugins/kotlin/plugin/resources/META-INF/file-types.xml
index 49e2985bb62d..97e9759f8733 100644
--- a/plugins/kotlin/plugin/resources/META-INF/file-types.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/file-types.xml
@@ -19,7 +19,7 @@
     <fileType name="KJSM" fieldName="INSTANCE" extensions="kjsm"
               implementationClass="org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType"/>
     <fileType name="kotlin_builtins" fieldName="INSTANCE" extensions="kotlin_builtins;kotlin_metadata"
-              implementationClass="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType"/>
+              implementationClass="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType"/>
     <fileType name="kotlin_module" fieldName="INSTANCE" extensions="kotlin_module"
               implementationClass="org.jetbrains.kotlin.idea.KotlinModuleFileType"/>
 
diff --git a/plugins/kotlin/plugin/resources/META-INF/formatter.xml b/plugins/kotlin/plugin/resources/META-INF/formatter.xml
new file mode 100644
index 000000000000..7d166c629dac
--- /dev/null
+++ b/plugins/kotlin/plugin/resources/META-INF/formatter.xml
@@ -0,0 +1,29 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.KotlinFormattingModelBuilder"/>
+
+    <lineIndentProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLineIndentProvider"/>
+
+    <preFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.KotlinPreFormatProcessor"/>
+
+    <postFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor"/>
+
+    <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLanguageCodeStyleSettingsProvider"/>
+
+    <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinGenerationSettingsProvider"/>
+
+    <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle"/>
+    <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinObsoleteCodeStyle"/>
+
+    <registryKey
+            key="kotlin.formatter.allowTrailingCommaInAnyProject"
+            description="Allow a trailing comma regardless of plugin version"
+            defaultValue="false"
+            restartRequired="false"/>
+    <registryKey
+            key="kotlin.formatter.allowTrailingCommaOnCallSite"
+            description="Allow a trailing comma on call-site"
+            defaultValue="false"
+            restartRequired="false"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/highlighting-common.xml b/plugins/kotlin/plugin/resources/META-INF/highlighting-common.xml
new file mode 100644
index 000000000000..e8f10422d425
--- /dev/null
+++ b/plugins/kotlin/plugin/resources/META-INF/highlighting-common.xml
@@ -0,0 +1,7 @@
+<idea-plugin>
+  <extensionPoints>
+     <extensionPoint
+            qualifiedName="org.jetbrains.kotlin.beforeResolveHighlightingVisitor"
+            interface="org.jetbrains.kotlin.idea.highlighter.BeforeResolveHighlightingExtension"/>
+  </extensionPoints>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/highlighting.xml b/plugins/kotlin/plugin/resources/META-INF/highlighting.xml
index 487e1982b3f5..c141e324d77a 100644
--- a/plugins/kotlin/plugin/resources/META-INF/highlighting.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/highlighting.xml
@@ -4,11 +4,9 @@
             qualifiedName="org.jetbrains.kotlin.highlighterExtension"
             interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"
             dynamic="true"/>
-    <extensionPoint
-            qualifiedName="org.jetbrains.kotlin.beforeResolveHighlightingVisitor"
-            interface="org.jetbrains.kotlin.idea.highlighter.BeforeResolveHighlightingExtension"/>
   </extensionPoints>
 
+
   <extensions defaultExtensionNs="com.intellij">
     <applicationService
             serviceInterface="org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor"
@@ -21,12 +19,6 @@
 
     <syntaxHighlighter factoryClass="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinSyntaxHighlighterProviderForDecompiledBuiltIns"/>
 
-    <lang.braceMatcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinPairMatcher"/>
-
-    <lang.parserDefinition language="kotlin" implementationClass="org.jetbrains.kotlin.parsing.KotlinParserDefinition"/>
-
-    <lang.commenter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinCommenter"/>
-
     <highlightVisitor implementation="org.jetbrains.kotlin.idea.highlighter.KotlinHighlightVisitor"/>
     <highlightVisitor implementation="org.jetbrains.kotlin.idea.highlighter.KotlinRainbowVisitor"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingSuspender"/>
@@ -56,28 +48,6 @@
     <additionalTextAttributes scheme="Default" file="colorScheme/Default_Kotlin.xml"/>
     <additionalTextAttributes scheme="Darcula" file="colorScheme/Darcula_Kotlin.xml"/>
 
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtFunctionPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtFunction"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtClass"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtObjectDeclaration"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtProperty"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtParameter"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtTypeAlias"/>
-    <itemPresentationProvider
-            implementationClass="org.jetbrains.kotlin.idea.presentation.KtJvmNameAnnotationPresenter"
-            forClass="org.jetbrains.kotlin.psi.KtAnnotationEntry"/>
-
     <registryKey
             key="kotlin.resolve.force.full.resolve.on.highlighting"
             description="Force to perform full resolve on highlighting"
diff --git a/plugins/kotlin/plugin/resources/META-INF/inspections.xml b/plugins/kotlin/plugin/resources/META-INF/inspections.xml
index fe3b1a2c6fc7..87cc6fde2f05 100644
--- a/plugins/kotlin/plugin/resources/META-INF/inspections.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/inspections.xml
@@ -2397,6 +2397,24 @@
                      language="kotlin"
                      key="inspection.redundant.label.migration.display.name" bundle="messages.KotlinBundle"/>
 
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.AmbiguousExpressionInWhenBranchMigrationInspection"
+                     groupPath="Kotlin"
+                     groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
+                     enabledByDefault="false"
+                     cleanupTool="true"
+                     level="WARNING"
+                     language="kotlin"
+                     key="inspection.ambiguous.expression.when.branch.migration.display.name" bundle="messages.KotlinBundle"/>
+
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.AddConversionCallMigrationInspection"
+                     groupPath="Kotlin"
+                     groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
+                     enabledByDefault="false"
+                     cleanupTool="true"
+                     level="WARNING"
+                     language="kotlin"
+                     key="inspection.add.conversion.call.display.name" bundle="messages.KotlinBundle"/>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.ProhibitUseSiteTargetAnnotationsOnSuperTypesMigrationInspection"
                      groupPath="Kotlin"
                      groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
@@ -2407,6 +2425,15 @@
                      key="inspection.prohibit.use.site.target.annotations.on.super.types.migration.display.name"
                      bundle="messages.KotlinBundle"/>
 
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.InlineClassDeprecatedMigrationInspection"
+                     groupPath="Kotlin"
+                     groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
+                     enabledByDefault="false"
+                     cleanupTool="true"
+                     level="WARNING"
+                     language="kotlin"
+                     key="inspection.deprecated.inline.classes.migration.display.name" bundle="messages.KotlinBundle"/>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.ProhibitRepeatedUseSiteTargetAnnotationsMigrationInspection"
                      groupPath="Kotlin"
                      groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
@@ -2416,6 +2443,22 @@
                      language="kotlin"
                      key="inspection.prohibit.repeated.use.site.target.annotations.migration.display.name" bundle="messages.KotlinBundle"/>
 
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.OverrideDeprecatedMigrationInspection"
+                     groupPath="Kotlin"
+                     groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
+                     enabledByDefault="false"
+                     level="ERROR"
+                     language="kotlin"
+                     key="inspection.do.not.propagate.method.deprecation.through.overrides" bundle="messages.KotlinBundle"/>
+
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.NoConstructorMigrationInspection"
+                     groupPath="Kotlin"
+                     groupBundle="messages.KotlinBundle" groupKey="group.names.migration"
+                     enabledByDefault="false"
+                     level="ERROR"
+                     language="kotlin"
+                     key="inspection.this.class.does.not.have.a.constructor" bundle="messages.KotlinBundle"/>
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.migration.NonExhaustiveWhenStatementMigrationInspection"
                      groupPath="Kotlin"
                      groupName="Migration"
diff --git a/plugins/kotlin/plugin/resources/META-INF/jps.xml b/plugins/kotlin/plugin/resources/META-INF/jps.xml
index 8d07a30fd6ec..5c2ab379f05e 100644
--- a/plugins/kotlin/plugin/resources/META-INF/jps.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/jps.xml
@@ -25,7 +25,6 @@
             serviceInterface="org.jetbrains.kotlin.config.KotlinFacetSettingsProvider"
             serviceImplementation="org.jetbrains.kotlin.idea.facet.KotlinFacetSettingsProviderImpl"/>
 
-    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-jps-common.jar;kotlin-common.jar"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.KotlinJpsClasspathProvider"/>
   </extensions>
 
diff --git a/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml b/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
index 032a5fe88f9e..5259aa82e62d 100644
--- a/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/kotlin-core.xml
@@ -208,9 +208,9 @@
 
     <search.topHitProvider implementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsTopHitProvider"/>
 
-    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler"/>
     <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileDecompiler"/>
-    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler"/>
 
     <moduleConfigurationEditorProvider implementation="org.jetbrains.kotlin.idea.roots.ui.NonJvmKotlinModuleEditorsProvider"/>
 
@@ -366,51 +366,26 @@
             displayType="STICKY_BALLOON"
             key="kotlin.external.compiler.updates.notification.group.name"
     />
+    <notificationGroup
+            id="Kotlin EAP Survey"
+            displayType="STICKY_BALLOON"
+            key="kotlin.eap.survey.notification.group.name"
+    />
+    <notificationGroup
+            id="Kotlin Maven project import"
+            displayType="STICKY_BALLOON"
+            key="configuration.maven.group.name"
+    />
   </extensions>
 
   <!-- Navigation -->
   <extensions defaultExtensionNs="com.intellij">
-    <navbar implementation="org.jetbrains.kotlin.idea.navigationToolbar.KotlinNavBarModelExtension" order="first"/>
 
     <applicationService
             serviceInterface="org.jetbrains.kotlin.psi.KotlinReferenceProvidersService"
             serviceImplementation="org.jetbrains.kotlin.idea.references.KtIdeReferenceProviderService"/>
 
-    <psi.referenceContributor
-            implementation="org.jetbrains.kotlin.idea.references.KotlinWebReferenceContributor"/>
-    <psi.referenceContributor
-            id="kotlinFilePathReferenceContributor"
-            language="kotlin"
-            implementation="org.jetbrains.kotlin.idea.references.KotlinFilePathReferenceContributor"/>
-  </extensions>
-
-  <!-- Formatter -->
-  <extensions defaultExtensionNs="com.intellij">
-    <lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.KotlinFormattingModelBuilder"/>
-
-    <lineIndentProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLineIndentProvider"/>
-
-    <preFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.KotlinPreFormatProcessor"/>
-
-    <postFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.TrailingCommaPostFormatProcessor"/>
 
-    <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLanguageCodeStyleSettingsProvider"/>
-
-    <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinGenerationSettingsProvider"/>
-
-    <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle"/>
-    <predefinedCodeStyle implementation="org.jetbrains.kotlin.idea.formatter.KotlinObsoleteCodeStyle"/>
-
-    <registryKey
-            key="kotlin.formatter.allowTrailingCommaInAnyProject"
-            description="Allow a trailing comma regardless of plugin version"
-            defaultValue="false"
-            restartRequired="false"/>
-    <registryKey
-            key="kotlin.formatter.allowTrailingCommaOnCallSite"
-            description="Allow a trailing comma on call-site"
-            defaultValue="false"
-            restartRequired="false"/>
   </extensions>
 
   <!-- Templates -->
@@ -538,9 +513,9 @@
 
     <importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.KotlinImportFilteringRule"/>
 
-    <targetElementEvaluator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator" />
+    <targetElementEvaluator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator" />
 
-    <targetElementUtilExtender implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator"/>
+    <targetElementUtilExtender implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator"/>
 
     <structuralsearch.profile implementation="org.jetbrains.kotlin.idea.structuralsearch.KotlinStructuralSearchProfile"/>
     <structuralsearch.filterProvider implementation="org.jetbrains.kotlin.idea.structuralsearch.filters.KotlinFilterProvider"/>
@@ -556,6 +531,11 @@
     <usageTypeProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinUsageTypeProviderImpl"/>
 
     <readWriteAccessDetector implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector" id="kotlin"/>
+
+    <applicationService
+            serviceInterface="org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.KotlinDeclarationInCompiledFileSearcher"
+            serviceImplementation="org.jetbrains.kotlin.analysis.decompiled.light.classes.fe10.KotlinDeclarationInCompiledFileSearcherFE10Impl"/>
+
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij.jvm">
diff --git a/plugins/kotlin/plugin/resources/META-INF/language.xml b/plugins/kotlin/plugin/resources/META-INF/language.xml
new file mode 100644
index 000000000000..8d3e2c19228b
--- /dev/null
+++ b/plugins/kotlin/plugin/resources/META-INF/language.xml
@@ -0,0 +1,31 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <lang.braceMatcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinPairMatcher"/>
+
+    <lang.parserDefinition language="kotlin" implementationClass="org.jetbrains.kotlin.parsing.KotlinParserDefinition"/>
+
+    <lang.commenter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinCommenter"/>
+
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtFunctionPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtFunction"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtClass"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtObjectDeclaration"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtProperty"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtParameter"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtDefaultDeclarationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtTypeAlias"/>
+    <itemPresentationProvider
+            implementationClass="org.jetbrains.kotlin.idea.presentation.KtJvmNameAnnotationPresenter"
+            forClass="org.jetbrains.kotlin.psi.KtAnnotationEntry"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/navigation-common.xml b/plugins/kotlin/plugin/resources/META-INF/navigation-common.xml
new file mode 100644
index 000000000000..45aae01f6e4b
--- /dev/null
+++ b/plugins/kotlin/plugin/resources/META-INF/navigation-common.xml
@@ -0,0 +1,13 @@
+<idea-plugin>
+  <extensions defaultExtensionNs="com.intellij">
+    <navbar implementation="org.jetbrains.kotlin.idea.navigationToolbar.KotlinNavBarModelExtension" order="first"/>
+
+    <psi.referenceContributor
+            id="kotlinFilePathReferenceContributor"
+            language="kotlin"
+            implementation="org.jetbrains.kotlin.idea.references.KotlinFilePathReferenceContributor"/>
+
+    <psi.referenceContributor
+            implementation="org.jetbrains.kotlin.idea.references.KotlinWebReferenceContributor"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/plugin/resources/META-INF/plugin.xml b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
index c89e067dc10a..ab3f64e6cc4c 100644
--- a/plugins/kotlin/plugin/resources/META-INF/plugin.xml
+++ b/plugins/kotlin/plugin/resources/META-INF/plugin.xml
@@ -18,6 +18,18 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
 
   <!--suppress PluginXmlValidity -->
   <change-notes><![CDATA[
+    <h3>1.7.0</h3>
+    <ul>
+      <li>New Kotlin K2 compiler for JVM in Alpha</li>
+      <li>Language: changes in builder inference, allowed implementation by delegation to inlined value of inline class, changes in Opt-in annotations</li>
+      <li>Kotlin/JVM: performance improvements, removed `1.6` target version</li>
+      <li>Kotlin/Native: performance improvement for the new memory manager, embeddable compiler jar for Kotlin/Native by default, returning `Void` instead of `KotlinUnit` from `suspend` functions by default, generation of standalone executable for androidNative targets by default, prohibited exceptions through Objective-C bridges</li>
+      <li>Kotlin/JS: performance improvements, smaller bundle size, generated `.js` compatible with old browsers and engines</li>
+      <li>Libraries: extensions for `java.util.Optional` in stdlib, min/max(By/With) functions for non-empty collections, stable `Regex.matchAt()`, `Regex.matchesAt()`, `findAnnotations()`, `DeepRecursiveFunction` functions, getting named groups of a regex match in JS and Native</li>
+      <li>Gradle: Experimental incremental compilation, minimal supported Gradle version is `6.7.1` and Android Gradle plugin is `3.6.4`, allow to override default Kotlin/Native compiler download URL, deprecated `kotlin.compiler.execution.strategy`, removed `useExperimentalAnnotation`, `experimentalAnnotationInUse`, `kotlin.coroutines` (and related `kotlin.experimental.coroutines` Gradle DSL option) properties</li>
+    </ul>
+    Learn more in the <a href="https://github.com/JetBrains/kotlin/releases/tag/v1.7.0">changelog</a>.
+    <br><br>
     <h3>1.6.20</h3>
     <ul>
       <li>Language: prototype of context receivers, definitely non-nullable types</li>
@@ -156,15 +168,20 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="/META-INF/extensions/compiler.xml" /> <!-- extensions/compiler.xml comes from the Kotlin compiler -->
 
   <xi:include href="kotlin-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="navigation-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="file-types.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="resolution.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="highlighting-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="highlighting.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="language.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="light-classes.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="formatter.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="completion.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="refactorings.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="inspections.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="indices.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="caches.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="caches-fe10.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="jps.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="statistics.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="scripting-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinCompilation.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinCompilation.kt
index f155bed7edf3..5dad4e214fe8 100644
--- a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinCompilation.kt
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinCompilation.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.kotlin.idea.projectModel
 
-interface KotlinCompilation : KotlinModule {
+interface KotlinCompilation : KotlinComponent {
 
     @Deprecated("Use allSourceSets or declaredSourceSets instead", ReplaceWith("declaredSourceSets"))
     val sourceSets: Collection<KotlinSourceSet>
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinComponent.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinComponent.kt
new file mode 100644
index 000000000000..c53136f7aa4d
--- /dev/null
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinComponent.kt
@@ -0,0 +1,28 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.projectModel
+
+import java.io.Serializable
+
+typealias KotlinDependencyId = Long
+
+@Deprecated(level = DeprecationLevel.ERROR, message = "Use org.jetbrains.kotlin.gradle.KotlinComponent instead")
+interface KotlinModule : Serializable {
+    val name: String
+    val dependencies: Array<KotlinDependencyId>
+
+    @Deprecated(level = DeprecationLevel.WARNING, message = "Use org.jetbrains.kotlin.gradle.KotlinComponent#isTestComponent instead")
+    val isTestModule: Boolean
+}
+
+@Suppress("DEPRECATION_ERROR")
+interface KotlinComponent : KotlinModule {
+    val isTestComponent: Boolean
+
+    @Deprecated(
+        "Use org.jetbrains.kotlin.gradle.KotlinComponent#isTestComponent instead", level = DeprecationLevel.WARNING,
+        replaceWith = ReplaceWith("isTestComponent")
+    )
+    @Suppress("OverridingDeprecatedMember")
+    override val isTestModule: Boolean
+        get() = isTestComponent
+}
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinFragment.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinFragment.kt
new file mode 100644
index 000000000000..628ccff3036f
--- /dev/null
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinFragment.kt
@@ -0,0 +1,20 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.projectModel
+
+import java.io.File
+import java.io.Serializable
+
+interface KotlinFragmentResolvedDependency : Serializable {
+    val dependencyIdentifier: String
+}
+
+interface KotlinFragment : Serializable {
+    val fragmentName: String
+    val isTestFragment: Boolean
+    val moduleIdentifier: KotlinModuleIdentifier
+    val languageSettings: KotlinLanguageSettings?
+    val directRefinesFragments: Collection<KotlinFragment>
+    val resolvedDependencies: Collection<KotlinFragmentResolvedDependency>
+    val sourceDirs: Set<File>
+    val resourceDirs: Set<File>
+}
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinKPMModule.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinKPMModule.kt
new file mode 100644
index 000000000000..3c1957cdc88e
--- /dev/null
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinKPMModule.kt
@@ -0,0 +1,31 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.projectModel
+
+import java.io.Serializable
+
+sealed interface KotlinModuleIdentifier : Serializable {
+    val moduleClassifier: String?
+}
+
+interface KotlinLocalModuleIdentifier : KotlinModuleIdentifier {
+    val buildId: String
+    val projectId: String
+}
+
+interface KotlinMavenModuleIdentifier : KotlinModuleIdentifier {
+    val group: String
+    val name: String
+}
+
+interface KotlinKPMModule : Serializable {
+    val moduleIdentifier: KotlinModuleIdentifier
+    val fragments: Collection<KotlinFragment>
+
+    companion object {
+        const val MAIN_MODULE_NAME = "main"
+        const val TEST_MODULE_NAME = "test"
+    }
+}
+
+val KotlinKPMModule.variants: Collection<KotlinVariant>
+    get() = fragments.filterIsInstance<KotlinVariant>()
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinModule.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinModule.kt
deleted file mode 100644
index 1e2ef9f47b5e..000000000000
--- a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinModule.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.kotlin.idea.projectModel
-
-import java.io.Serializable
-
-typealias KotlinDependencyId = Long
-
-interface KotlinModule : Serializable {
-    val name: String
-    val dependencies: Array<KotlinDependencyId>
-    val isTestModule: Boolean
-}
\ No newline at end of file
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinSourceSet.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinSourceSet.kt
index a5cb6cf28a77..3353febfd6c3 100644
--- a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinSourceSet.kt
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinSourceSet.kt
@@ -3,7 +3,7 @@ package org.jetbrains.kotlin.idea.projectModel
 
 import java.io.File
 
-interface KotlinSourceSet : KotlinModule {
+interface KotlinSourceSet : KotlinComponent {
     val languageSettings: KotlinLanguageSettings
     val sourceDirs: Set<File>
     val resourceDirs: Set<File>
diff --git a/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinVariant.kt b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinVariant.kt
new file mode 100644
index 000000000000..4cc1f0522026
--- /dev/null
+++ b/plugins/kotlin/project-model/src/org/jetbrains/kotlin/idea/projectModel/KotlinVariant.kt
@@ -0,0 +1,11 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.projectModel
+
+typealias KotlinKPMAttributeKeyId = String
+typealias KotlinKPMAttributeValueId = String
+typealias KotlinKPMVariantAttributesMap = Map<KotlinKPMAttributeKeyId, KotlinKPMAttributeValueId>
+
+interface KotlinVariant: KotlinFragment {
+    val variantAttributes: KotlinKPMVariantAttributesMap
+    val compilationOutputs: KotlinCompilationOutput?
+}
diff --git a/plugins/kotlin/project-tests/fe10-project-tests/kotlin.fe10-project-tests.iml b/plugins/kotlin/project-tests/fe10-project-tests/kotlin.fe10-project-tests.iml
index 658cf850ac27..371fa50ad7a9 100644
--- a/plugins/kotlin/project-tests/fe10-project-tests/kotlin.fe10-project-tests.iml
+++ b/plugins/kotlin/project-tests/fe10-project-tests/kotlin.fe10-project-tests.iml
@@ -40,7 +40,6 @@
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.native" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
diff --git a/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/AbstractFE10ProjectBasedTests.kt b/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/AbstractFE10ProjectBasedTests.kt
index 0585ad2cf37a..0202787e93ae 100644
--- a/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/AbstractFE10ProjectBasedTests.kt
+++ b/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/AbstractFE10ProjectBasedTests.kt
@@ -6,19 +6,14 @@ import com.intellij.openapi.util.SimpleModificationTracker
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.analyzer.KotlinModificationTrackerService
 import org.jetbrains.kotlin.idea.base.KotlinPluginKind
-import org.jetbrains.kotlin.idea.base.assertKotlinPluginKind
 import org.jetbrains.kotlin.idea.base.project.test.AbstractProjectBasedTest
 
 abstract class AbstractFE10ProjectBasedTests : AbstractProjectBasedTest() {
-
-    override fun setUp() {
-        super.setUp()
-        assertKotlinPluginKind(KotlinPluginKind.FE10_PLUGIN)
-    }
+    override val pluginKind: KotlinPluginKind = KotlinPluginKind.FE10_PLUGIN
 
     override fun invalidateCaches(project: Project) {
         PsiManager.getInstance(project).dropResolveCaches()
         PsiManager.getInstance(project).dropPsiCaches()
         (project.getService(KotlinModificationTrackerService::class.java).outOfBlockModificationTracker as SimpleModificationTracker).incModificationCount()
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/perf/Fe10RustPerformanceTest.kt b/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/perf/Fe10RustPerformanceTest.kt
index 1845c419ce3d..7f271d47ea3e 100644
--- a/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/perf/Fe10RustPerformanceTest.kt
+++ b/plugins/kotlin/project-tests/fe10-project-tests/test/org/jetbrains/kotlin/idea/project/tests/perf/Fe10RustPerformanceTest.kt
@@ -2,22 +2,19 @@
 package org.jetbrains.kotlin.idea.project.tests.perf
 
 import org.jetbrains.kotlin.idea.AbstractFE10ProjectBasedTests
-import org.jetbrains.kotlin.idea.base.KotlinPluginKind
-import org.jetbrains.kotlin.idea.base.assertKotlinPluginKind
 import org.jetbrains.kotlin.idea.base.project.test.ProjectBasedTestPreferences
 import org.jetbrains.kotlin.idea.base.project.test.projects.RustProject
 
 class Fe10RustPerformanceTest : AbstractFE10ProjectBasedTests() {
-    override val testPrefix: String = "FE10"
-    override val warmUpOnHelloWorldProject: Boolean = true
+    override val isBenchmark: Boolean = true
 
     fun testRustPlugin() {
         val profile = ProjectBasedTestPreferences(
             warmUpIterations = 5,
             iterations = 10,
-            checkForValidity = false,
+            checkForValidity = true,
         )
 
-        test("Rust Plugin", RustProject.project, RustProject.actions, profile)
+        test(RustProject.project, RustProject.actions, profile)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/project-tests/fir-project-tests/kotlin.fir.fir-project-tests.iml b/plugins/kotlin/project-tests/fir-project-tests/kotlin.fir.fir-project-tests.iml
index 1abc388bf427..fe24a73fcb3c 100644
--- a/plugins/kotlin/project-tests/fir-project-tests/kotlin.fir.fir-project-tests.iml
+++ b/plugins/kotlin/project-tests/fir-project-tests/kotlin.fir.fir-project-tests.iml
@@ -38,7 +38,6 @@
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.native" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
diff --git a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/AbstractFirProjectBasedTests.kt b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/AbstractFirProjectBasedTests.kt
index 632bde6ae5c4..c7e768941a70 100644
--- a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/AbstractFirProjectBasedTests.kt
+++ b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/AbstractFirProjectBasedTests.kt
@@ -5,14 +5,10 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiManager
 import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory
 import org.jetbrains.kotlin.idea.base.KotlinPluginKind
-import org.jetbrains.kotlin.idea.base.assertKotlinPluginKind
 import org.jetbrains.kotlin.idea.base.project.test.AbstractProjectBasedTest
 
 abstract class AbstractFirProjectBasedTests: AbstractProjectBasedTest() {
-    override fun setUp() {
-        super.setUp()
-        assertKotlinPluginKind(KotlinPluginKind.FIR_PLUGIN)
-    }
+    override val pluginKind: KotlinPluginKind = KotlinPluginKind.FIR_PLUGIN
 
     override fun invalidateCaches(project: Project) {
         PsiManager.getInstance(project).dropResolveCaches()
diff --git a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2EKotlinTest.kt b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2EKotlinTest.kt
new file mode 100644
index 000000000000..3e334d965822
--- /dev/null
+++ b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2EKotlinTest.kt
@@ -0,0 +1,20 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.fir.project.tests.e2e
+
+import org.jetbrains.kotlin.idea.base.project.test.ProjectBasedTestPreferences
+import org.jetbrains.kotlin.idea.base.project.test.projects.KotlinProject
+import org.jetbrains.kotlin.idea.fir.project.tests.AbstractFirProjectBasedTests
+
+class FirE2EKotlinTest : AbstractFirProjectBasedTests() {
+    override val isBenchmark: Boolean = false
+
+    fun testKotlin() {
+        val profile = ProjectBasedTestPreferences(
+            warmUpIterations = 0,
+            iterations = 1,
+            checkForValidity = true,
+        )
+
+        test(KotlinProject.project, KotlinProject.actions, profile)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2ETest.kt b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2ETest.kt
index 6aef2cc63988..6cdd68de8238 100644
--- a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2ETest.kt
+++ b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/e2e/FirE2ETest.kt
@@ -6,16 +6,15 @@ import org.jetbrains.kotlin.idea.base.project.test.projects.RustProject
 import org.jetbrains.kotlin.idea.fir.project.tests.AbstractFirProjectBasedTests
 
 class FirE2ETest : AbstractFirProjectBasedTests() {
-    override val testPrefix: String = "FIR e2e"
-    override val warmUpOnHelloWorldProject: Boolean = false
+    override val isBenchmark: Boolean = false
 
     fun testRustPlugin() {
         val profile = ProjectBasedTestPreferences(
             warmUpIterations = 0,
             iterations = 1,
-            checkForValidity = false,
+            checkForValidity = true,
         )
 
-        test("Rust Plugin", RustProject.project, RustProject.actions, profile)
+        test(RustProject.project, RustProject.actions, profile)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/perf/FirRustPerformanceTest.kt b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/perf/FirRustPerformanceTest.kt
index 853c67335b20..28d959364cd3 100644
--- a/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/perf/FirRustPerformanceTest.kt
+++ b/plugins/kotlin/project-tests/fir-project-tests/test/org/jetbrains/kotlin/idea/fir/project/tests/perf/FirRustPerformanceTest.kt
@@ -6,8 +6,7 @@ import org.jetbrains.kotlin.idea.base.project.test.projects.RustProject
 import org.jetbrains.kotlin.idea.fir.project.tests.AbstractFirProjectBasedTests
 
 class FirRustPerformanceTest : AbstractFirProjectBasedTests() {
-    override val testPrefix: String = "FIR"
-    override val warmUpOnHelloWorldProject: Boolean = true
+    override val isBenchmark: Boolean = true
 
     fun testRustPlugin() {
         val profile = ProjectBasedTestPreferences(
@@ -16,6 +15,6 @@ class FirRustPerformanceTest : AbstractFirProjectBasedTests() {
             checkForValidity = true,
         )
 
-        test("Rust Plugin", RustProject.project, RustProject.actions, profile)
+        test(RustProject.project, RustProject.actions, profile)
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/project-tests/project-tests-base/kotlin.base.project-tests-base.iml b/plugins/kotlin/project-tests/project-tests-base/kotlin.base.project-tests-base.iml
index 0a51ea30749c..a77d15c50fcc 100644
--- a/plugins/kotlin/project-tests/project-tests-base/kotlin.base.project-tests-base.iml
+++ b/plugins/kotlin/project-tests/project-tests-base/kotlin.base.project-tests-base.iml
@@ -39,7 +39,6 @@
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.native" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.formatter" scope="TEST" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.jvm" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
diff --git a/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/AbstractProjectBasedTest.kt b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/AbstractProjectBasedTest.kt
index 970655753bac..0183ab75b070 100644
--- a/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/AbstractProjectBasedTest.kt
+++ b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/AbstractProjectBasedTest.kt
@@ -7,25 +7,40 @@ import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
+import org.jetbrains.kotlin.idea.base.KotlinPluginKind
+import org.jetbrains.kotlin.idea.base.assertKotlinPluginKind
 import org.jetbrains.kotlin.idea.perf.*
 import org.jetbrains.kotlin.idea.perf.common.HighlightFile
 import org.jetbrains.kotlin.idea.perf.common.ProjectAction
 import org.jetbrains.kotlin.idea.perf.common.ProjectData
 import org.jetbrains.kotlin.idea.perf.common.TypeAndAutocompleteInFile
 import org.jetbrains.kotlin.idea.perf.live.AbstractPerformanceProjectsTest
+import org.jetbrains.kotlin.idea.perf.util.Benchmark
+import org.jetbrains.kotlin.idea.perf.util.BenchmarkAdditionalData
+import org.jetbrains.kotlin.idea.perf.util.EsUploaderConfiguration
 import org.jetbrains.kotlin.idea.perf.util.TeamCity
 import org.jetbrains.kotlin.idea.testFramework.EditorFile
 import org.jetbrains.kotlin.idea.testFramework.ProjectOpenAction
 
 abstract class AbstractProjectBasedTest : AbstractPerformanceProjectsTest() {
-    abstract val testPrefix: String
+    abstract val pluginKind: KotlinPluginKind
 
-    abstract val warmUpOnHelloWorldProject: Boolean
+    abstract val isBenchmark: Boolean
+
+    private val frontendName: String
+        get() = when (pluginKind) {
+            KotlinPluginKind.FE10_PLUGIN -> "FE10"
+            KotlinPluginKind.FIR_PLUGIN -> "FIR"
+        }
+
+    private val testSuitePrefix get() = frontendName
 
     override fun setUp() {
         super.setUp()
-        if (warmUpOnHelloWorldProject) {
-            val hwStats = Stats("$testPrefix warmup project")
+        assertKotlinPluginKind(pluginKind)
+
+        if (isBenchmark) {
+            val hwStats = Stats("$testSuitePrefix warmup project")
             val warmUpProject = WarmUpProject(hwStats)
             warmUpProject.warmUp(this)
         }
@@ -34,30 +49,48 @@ abstract class AbstractProjectBasedTest : AbstractPerformanceProjectsTest() {
     protected abstract fun invalidateCaches(project: Project)
 
     protected fun test(
-        name: String,
         project: ProjectData,
         actions: List<ProjectAction>,
         profile: ProjectBasedTestPreferences,
     ) {
-        TeamCity.suite("$testPrefix $name") {
-            Stats("$testPrefix $name").use { stats ->
+        val suiteName = "$testSuitePrefix ${project.name}"
+        TeamCity.suite(suiteName) {
+            Stats(
+                name = suiteName,
+                esUploaderConfiguration = if (isBenchmark) esUploaderConfiguration else EsUploaderConfiguration.DoNotUploadToEs,
+            ).use { stats ->
                 perfOpenRustPluginProject(project, stats)
                 for (action in actions) {
-                    runAction(action, stats, profile)
+                    runAction(action, stats, project, profile)
                 }
             }
         }
     }
 
+    private fun patchBenchmark(benchmark: Benchmark, project: ProjectData, file: String, actionId: String): Benchmark =
+        benchmark.copy(
+            additionalData = ProjectPerfTestAdditionalData(
+                frontend = frontendName,
+                project = project.name,
+                file = file,
+                action = actionId,
+            )
+        )
+
 
     @OptIn(ExperimentalStdlibApi::class)
     @Suppress("UNCHECKED_CAST")
-    private fun runAction(action: ProjectAction, stats: Stats, profile: ProjectBasedTestPreferences) {
+    private fun runAction(action: ProjectAction, stats: Stats, project: ProjectData, profile: ProjectBasedTestPreferences) {
         val projectTestOverride = settingsOverride<Any, Any> {
             warmUpIterations(profile.warmUpIterations)
             iterations(profile.iterations)
             reportCompilerCounters(false)
         }
+        val benchmarkSettingOverride = settingsOverride<Any, Any> {
+            benchmarkTransformer { benchmark ->
+                patchBenchmark(benchmark, project, action.filePath, action.id)
+            }
+        }
         when (action) {
             is HighlightFile -> {
                 perfHighlightFileEmptyProfile(
@@ -65,16 +98,17 @@ abstract class AbstractProjectBasedTest : AbstractPerformanceProjectsTest() {
                     stats = stats,
                     stopAtException = true,
                     tearDown = { invalidateCaches(project()) },
-                    overrides = buildList {
+                    overrides = buildList<PerfTestSettingsOverride<EditorFile, List<HighlightInfo>>> {
                         add(projectTestOverride as PerfTestSettingsOverride<EditorFile, List<HighlightInfo>>)
                         if (profile.checkForValidity) {
-                            add(settingsOverride<EditorFile, List<HighlightInfo>> {
+                            add(settingsOverride {
                                 afterTestCheck { (file, highlightings) ->
                                     val psiFile = file?.psiFile ?: error("No file was provided")
                                     checkHighlightings(psiFile, highlightings)
                                 }
                             })
                         }
+                        add(benchmarkSettingOverride as PerfTestSettingsOverride<EditorFile, List<HighlightInfo>>)
                     }
                 )
             }
@@ -89,7 +123,8 @@ abstract class AbstractProjectBasedTest : AbstractPerformanceProjectsTest() {
                     note = action.note ?: "",
                     stopAtException = true,
                     overrides = listOf(
-                        projectTestOverride as PerfTestSettingsOverride<Unit, Array<LookupElement>>
+                        projectTestOverride as PerfTestSettingsOverride<Unit, Array<LookupElement>>,
+                        benchmarkSettingOverride as PerfTestSettingsOverride<Unit, Array<LookupElement>>,
                     )
                 )
             }
@@ -144,6 +179,21 @@ abstract class AbstractProjectBasedTest : AbstractPerformanceProjectsTest() {
 
     companion object {
         private const val ORG_GRADLE_NATIVE = "org.gradle.native"
+
+         val esUploaderConfiguration = EsUploaderConfiguration.UploadToEs(
+            indexName = "kotlin_fir_ide_benchmarks",
+        )
+    }
+}
+
+data class ProjectPerfTestAdditionalData(
+    var frontend: String,
+    var project: String,
+    var file: String,
+    var action: String,
+) : BenchmarkAdditionalData {
+    override fun getId(): String {
+        return "${frontend}_${project}_${file}_$action".filter { it in 'a'..'z' || it in 'A'..'Z' || it == '_' }
     }
 }
 
diff --git a/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/KotlinProject.kt b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/KotlinProject.kt
new file mode 100644
index 000000000000..8854c2449a79
--- /dev/null
+++ b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/KotlinProject.kt
@@ -0,0 +1,42 @@
+// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.kotlin.idea.base.project.test.projects
+
+import org.jetbrains.kotlin.idea.perf.common.HighlightFile
+import org.jetbrains.kotlin.idea.perf.common.ProjectAction
+import org.jetbrains.kotlin.idea.perf.common.ProjectData
+import org.jetbrains.kotlin.idea.perf.common.perfTestProjectPath
+import org.jetbrains.kotlin.idea.testFramework.ProjectOpenAction
+
+object KotlinProject {
+    val project = ProjectData(
+        name = "kotlin",
+        path = perfTestProjectPath("kotlin"),
+        openAction = ProjectOpenAction.GRADLE_PROJECT,
+    )
+
+    val actions: List<ProjectAction> =
+        listOf(
+            HighlightFile("analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt"),
+            HighlightFile("analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt"),
+            HighlightFile("compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrorsDefaultMessages.kt"),
+            HighlightFile("compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt"),
+            HighlightFile("compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.kt"),
+            HighlightFile("compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.kt"),
+            HighlightFile("compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt"),
+            HighlightFile("compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt"),
+            HighlightFile("compiler/ir/backend.jvm/codegen/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt"),
+            HighlightFile("plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt"),
+            HighlightFile("compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt"),
+            HighlightFile("compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrDeclarationStorage.kt"),
+            HighlightFile("compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt"),
+            HighlightFile("compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt"),
+            HighlightFile("compiler/frontend.common-psi/src/org/jetbrains/kotlin/diagnostics/LightTreePositioningStrategies.kt"),
+            HighlightFile("compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt"),
+            HighlightFile("compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt"),
+            HighlightFile("compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt"),
+            HighlightFile("compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt"),
+            HighlightFile("plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt"),
+            HighlightFile("compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt"),
+        )
+
+}
\ No newline at end of file
diff --git a/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/RustProject.kt b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/RustProject.kt
index 3e37f27848fb..06dea31b3b44 100644
--- a/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/RustProject.kt
+++ b/plugins/kotlin/project-tests/project-tests-base/test/org/jetbrains/kotlin/idea/base/project/test/projects/RustProject.kt
@@ -20,7 +20,7 @@ object RustProject {
         val basePath = "src/main/kotlin/org/rust"
 
         listOf(
-            //HighlightFile("$basePath/lang/core/stubs/StubImplementations.kt"),
+            HighlightFile("$basePath/lang/core/stubs/StubImplementations.kt"),
             HighlightFile("$basePath/lang/core/resolve/NameResolution.kt"),
             HighlightFile("$basePath/ide/annotator/RsErrorAnnotator.kt"),
             HighlightFile("$basePath/lang/core/types/infer/TypeInferenceWalker.kt"),
diff --git a/plugins/kotlin/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt b/plugins/kotlin/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
index 18e0738398dc..577a6c5814fa 100644
--- a/plugins/kotlin/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
+++ b/plugins/kotlin/project-wizard/cli/test/org/jetbrains/kotlin/tools/projectWizard/cli/AbstractBuildFileGenerationTest.kt
@@ -60,6 +60,7 @@ abstract class AbstractBuildFileGenerationTest : UsefulTestCase() {
                 listOf(Repositories.JETBRAINS_KOTLIN_DEV.url),
                 KOTLIN_REPO_PLACEHOLDER
             ).replace("gradle-${Versions.GRADLE.text}-bin.zip", "gradle-GRADLE_VERSION-bin.zip")
+                .replace("gradle-${Versions.GRADLE_VERSION_FOR_COMPOSE.text}-bin.zip", "gradle-GRADLE_VERSION_FOR_COMPOSE-bin.zip")
         }
     }
 
diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
index ce3716ccefdf..af9b9c3e4a11 100644
--- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
+++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
@@ -8,17 +8,17 @@ group = 'testGroupId'
 version = '1.0-SNAPSHOT'
 
 dependencies {
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     defaultConfig {
         applicationId 'testGroupId.android'
         minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName '1.0'
     }
diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
index 7b1c74356c49..5d715913c258 100644
--- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
@@ -8,17 +8,17 @@ group = "testGroupId"
 version = "1.0-SNAPSHOT"
 
 dependencies {
-    implementation("com.google.android.material:material:1.2.1")
-    implementation("androidx.appcompat:appcompat:1.2.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.0.2")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
 }
 
 android {
-    compileSdkVersion(29)
+    compileSdkVersion(31)
     defaultConfig {
         applicationId = "testGroupId.android"
         minSdkVersion(24)
-        targetSdkVersion(29)
+        targetSdkVersion(31)
         versionCode = 1
         versionName = "1.0"
     }
diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle
index 59e6d776e0e7..6c76bc26f512 100644
--- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle
+++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION')
-        classpath('com.android.tools.build:gradle:4.1.2')
+        classpath('com.android.tools.build:gradle:4.2.2')
     }
 }
 
diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts
index 05f78d637036..b6d5b30dfe6d 100644
--- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION")
-        classpath("com.android.tools.build:gradle:4.1.2")
+        classpath("com.android.tools.build:gradle:4.2.2")
     }
 }
 
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
index 5ef42f98397b..0dfd651bdc50 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm") version "1.6.10"
-    id("org.jetbrains.compose") version "1.0.1"
+    id("org.jetbrains.compose") version "1.1.0"
 }
 
 group = "me.user"
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/gradle/wrapper/gradle-wrapper.properties b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/gradle/wrapper/gradle-wrapper.properties
index daa29a6201d3..d58f3a7ce3cf 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/gradle/wrapper/gradle-wrapper.properties
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_VERSION_FOR_COMPOSE-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
index 6cd660a757cc..9b01844bcede 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.compose") version "1.0.1"
+    id("org.jetbrains.compose") version "1.1.0"
     id("com.android.application")
     kotlin("android")
 }
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation(project(":common"))
-    implementation("androidx.activity:activity-compose:1.3.0")
+    implementation("androidx.activity:activity-compose:1.4.0")
 }
 
 android {
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts
index 17defd7c8b25..1e8def0f9a76 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
-        classpath("com.android.tools.build:gradle:4.1.2")
+        classpath("com.android.tools.build:gradle:4.2.2")
     }
 }
 
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
index abf79f722706..b68e0be4518a 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.0.1"
+    id("org.jetbrains.compose") version "1.1.0"
     id("com.android.library")
 }
 
@@ -31,13 +31,13 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("androidx.appcompat:appcompat:1.2.0")
-                api("androidx.core:core-ktx:1.3.1")
+                api("androidx.appcompat:appcompat:1.4.1")
+                api("androidx.core:core-ktx:1.7.0")
             }
         }
         val androidTest by getting {
             dependencies {
-                implementation("junit:junit:4.13")
+                implementation("junit:junit:4.13.2")
             }
         }
         val desktopMain by getting {
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
index dc3f63dd657e..82d78bfde338 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     kotlin("multiplatform")
-    id("org.jetbrains.compose") version "1.0.1"
+    id("org.jetbrains.compose") version "1.1.0"
 }
 
 group = "me.user"
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/gradle/wrapper/gradle-wrapper.properties b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/gradle/wrapper/gradle-wrapper.properties
index daa29a6201d3..d58f3a7ce3cf 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/gradle/wrapper/gradle-wrapper.properties
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-GRADLE_VERSION_FOR_COMPOSE-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml
index b151d11a5925..bbf3b562363d 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/consoleApplication/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.6.0</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
index 11ee2070078a..359f361366cd 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
@@ -41,8 +41,8 @@ kotlin {
         }
         jvmMain {
             dependencies {
-                implementation 'io.ktor:ktor-server-netty:1.6.7'
-                implementation 'io.ktor:ktor-html-builder:1.6.7'
+                implementation 'io.ktor:ktor-server-netty:2.0.1'
+                implementation 'io.ktor:ktor-server-html-builder-jvm:2.0.1'
                 implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2'
             }
         }
@@ -51,9 +51,9 @@ kotlin {
         }
         jsMain {
             dependencies {
-                implementation 'org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.290-kotlin-1.6.10'
-                implementation 'org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.290-kotlin-1.6.10'
-                implementation 'org.jetbrains.kotlin-wrappers:kotlin-react-css:17.0.2-pre.290-kotlin-1.6.10'
+                implementation 'org.jetbrains.kotlin-wrappers:kotlin-react:18.0.0-pre.332-kotlin-1.6.21'
+                implementation 'org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.0.0-pre.332-kotlin-1.6.21'
+                implementation 'org.jetbrains.kotlin-wrappers:kotlin-emotion:11.9.0-pre.332-kotlin-1.6.21'
             }
         }
         jsTest {
diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
index 087b262d34e9..40d2bcfc46a4 100644
--- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
+++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
@@ -39,17 +39,17 @@ kotlin {
         }
         val jvmMain by getting {
             dependencies {
-                implementation("io.ktor:ktor-server-netty:1.6.7")
-                implementation("io.ktor:ktor-html-builder:1.6.7")
+                implementation("io.ktor:ktor-server-netty:2.0.1")
+                implementation("io.ktor:ktor-server-html-builder-jvm:2.0.1")
                 implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2")
             }
         }
         val jvmTest by getting
         val jsMain by getting {
             dependencies {
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.290-kotlin-1.6.10")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.290-kotlin-1.6.10")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-css:17.0.2-pre.290-kotlin-1.6.10")
+                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:18.0.0-pre.332-kotlin-1.6.21")
+                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.0.0-pre.332-kotlin-1.6.21")
+                implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.9.0-pre.332-kotlin-1.6.21")
             }
         }
         val jsTest by getting
diff --git a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/android/AndroidManifest.xml.vm b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/android/AndroidManifest.xml.vm
index dada41f467f3..68a55f97f945 100644
--- a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/android/AndroidManifest.xml.vm
+++ b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/android/AndroidManifest.xml.vm
@@ -4,7 +4,7 @@
             android:allowBackup="false"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/ktorServer/server.kt.vm b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/ktorServer/server.kt.vm
index 4a03bfddd460..3fe6a9c0e090 100644
--- a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/ktorServer/server.kt.vm
+++ b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/ktorServer/server.kt.vm
@@ -1,12 +1,12 @@
 package ${package}
 
-import io.ktor.application.call
-import io.ktor.html.respondHtml
 import io.ktor.http.HttpStatusCode
-import io.ktor.routing.get
-import io.ktor.routing.routing
+import io.ktor.server.application.*
 import io.ktor.server.engine.embeddedServer
+import io.ktor.server.html.*
+import io.ktor.server.http.content.*
 import io.ktor.server.netty.Netty
+import io.ktor.server.routing.*
 #foreach($import in $imports)
 import $import
 #end
diff --git a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactClient.kt.vm b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactClient.kt.vm
index 7331ceccf2d6..41d07cbc0014 100644
--- a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactClient.kt.vm
+++ b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactClient.kt.vm
@@ -1,6 +1,6 @@
 import kotlinx.browser.document
 import react.create
-import react.dom.render
+import react.dom.client.createRoot
 
 fun main() {
     val container = document.createElement("div")
@@ -9,5 +9,5 @@ fun main() {
     val welcome = Welcome.create {
         name = "Kotlin/JS"
     }
-    render(welcome, container)
+    createRoot(container).render(welcome)
 }
\ No newline at end of file
diff --git a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactComponent.kt.vm b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactComponent.kt.vm
index 3a650a316151..0de2f08321a5 100644
--- a/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactComponent.kt.vm
+++ b/plugins/kotlin/project-wizard/core/resources/org/jetbrains/kotlin/tools/projectWizard/templates/reactJsClient/reactComponent.kt.vm
@@ -2,7 +2,7 @@ import csstype.px
 import csstype.rgb
 import react.FC
 import react.Props
-import react.css.css
+import emotion.react.css
 import react.dom.html.InputType
 import react.dom.html.ReactHTML.div
 import react.dom.html.ReactHTML.input
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
index ba62810ccbac..bb5d14681893 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
@@ -10,24 +10,24 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
 @Suppress("ClassName", "SpellCheckingInspection")
 object Versions {
     val KOTLIN = version("1.5.0") // used as fallback version
-    val GRADLE = version("7.3.3")
-    val KTOR = version("1.6.7")
-    val JUNIT = version("4.13")
-    val JUNIT5 = version("5.6.0")
-    val JETBRAINS_COMPOSE = version("1.0.1")
+    val GRADLE = version("7.4.2")
+    val KTOR = version("2.0.1")
+    val JUNIT = version("4.13.2")
+    val JUNIT5 = version("5.8.2")
+    val JETBRAINS_COMPOSE = version("1.1.0")
 
     val KOTLIN_VERSION_FOR_COMPOSE = version("1.6.10")
-    val GRADLE_VERSION_FOR_COMPOSE = version("6.9")
+    val GRADLE_VERSION_FOR_COMPOSE = version("7.3.3")
 
     object COMPOSE {
-        val ANDROID_ACTIVITY_COMPOSE = version("1.3.0")
+        val ANDROID_ACTIVITY_COMPOSE = version("1.4.0")
     }
 
     object ANDROID {
-        val ANDROID_MATERIAL = version("1.2.1")
-        val ANDROIDX_APPCOMPAT = version("1.2.0")
-        val ANDROIDX_CONSTRAINTLAYOUT = version("2.0.2")
-        val ANDROIDX_KTX = version("1.3.1")
+        val ANDROID_MATERIAL = version("1.5.0")
+        val ANDROIDX_APPCOMPAT = version("1.4.1")
+        val ANDROIDX_CONSTRAINTLAYOUT = version("2.1.3")
+        val ANDROIDX_KTX = version("1.7.0")
     }
 
     object KOTLINX {
@@ -36,19 +36,19 @@ object Versions {
     }
 
     object JS_WRAPPERS {
-        val KOTLIN_REACT = wrapperVersion("17.0.2")
+        val KOTLIN_REACT = wrapperVersion("18.0.0")
         val KOTLIN_REACT_DOM = KOTLIN_REACT
-        val KOTLIN_REACT_CSS = KOTLIN_REACT
-        val KOTLIN_REACT_ROUTER_DOM = wrapperVersion("6.2.1")
+        val KOTLIN_EMOTION = wrapperVersion("11.9.0")
+        val KOTLIN_REACT_ROUTER_DOM = wrapperVersion("6.3.0")
         val KOTLIN_REDUX = wrapperVersion("4.1.2")
         val KOTLIN_REACT_REDUX = wrapperVersion("7.2.6")
 
         private fun wrapperVersion(version: String): Version =
-            version("$version-pre.290-kotlin-1.6.10")
+            version("$version-pre.332-kotlin-1.6.21")
     }
 
     object GRADLE_PLUGINS {
-        val ANDROID = version("4.1.2")
+        val ANDROID = version("4.2.2")
     }
 
     object MAVEN_PLUGINS {
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt
index a1b2a673155c..26d0141499cb 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt
@@ -15,7 +15,7 @@ data class AndroidConfigIR(
     val newManifestPath: Path?,
     val printVersionCode: Boolean,
     val printBuildTypes: Boolean,
-    var androidSdkVersion: String = "29"
+    var androidSdkVersion: String = "31"
 ) : AndroidIR, FreeIR {
     override fun GradlePrinter.renderGradle() {
         sectionCall("android", needIndent = true) {
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/JsClientTemplate.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/JsClientTemplate.kt
index 0db240792f87..34f30bbb042e 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/JsClientTemplate.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/JsClientTemplate.kt
@@ -72,15 +72,6 @@ abstract class JsClientTemplate : Template() {
                 }
             }
 
-            interceptAtPoint(template.imports) { value ->
-                if (value.isNotEmpty()) return@interceptAtPoint value
-                buildList {
-                    +value
-                    +"io.ktor.http.content.resources"
-                    +"io.ktor.http.content.static"
-                }
-            }
-
             interceptAtPoint(template.elements) { value ->
                 if (value.isNotEmpty()) return@interceptAtPoint value
                 buildList {
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
index 01fae012937b..e349bd866323 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
@@ -40,7 +40,7 @@ object KtorServerTemplate : Template() {
         withSettingsOf(module.originalModule) {
             buildList {
                 +DEPENDENCIES.KTOR_SERVER_NETTY
-                +ktorArtifactDependency("ktor-html-builder")
+                +ktorArtifactDependency("ktor-server-html-builder-jvm")
                 +ArtifactBasedLibraryDependencyIR(
                     MavenArtifact(Repositories.KOTLINX_HTML, "org.jetbrains.kotlinx", "kotlinx-html-jvm"),
                     Versions.KOTLINX.KOTLINX_HTML,
diff --git a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt
index fe6388fed795..bcebd6785175 100644
--- a/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt
+++ b/plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt
@@ -60,7 +60,7 @@ object ReactJsClientTemplate : JsClientTemplate() {
             val kotlinVersion = KotlinPlugin.version.propertyValue
             +Dependencies.KOTLIN_REACT
             +Dependencies.KOTLIN_REACT_DOM
-            +Dependencies.KOTLIN_REACT_CSS
+            +Dependencies.KOTLIN_EMOTION
             if (useReactRouterDom.reference.settingValue) {
                 +Dependencies.KOTLIN_REACT_ROUTER_DOM
             }
@@ -98,9 +98,9 @@ object ReactJsClientTemplate : JsClientTemplate() {
             Versions.JS_WRAPPERS.KOTLIN_REACT_DOM
         )
 
-        val KOTLIN_REACT_CSS = wrapperDependency(
-            "kotlin-react-css",
-            Versions.JS_WRAPPERS.KOTLIN_REACT_CSS
+        val KOTLIN_EMOTION = wrapperDependency(
+            "kotlin-emotion",
+            Versions.JS_WRAPPERS.KOTLIN_EMOTION
         )
 
         val KOTLIN_REACT_ROUTER_DOM = wrapperDependency(
diff --git a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
index 46ab1d14dbf4..0aa3f301b14e 100644
--- a/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
+++ b/plugins/kotlin/project-wizard/idea/kotlin.project-wizard.idea.iml
@@ -18,7 +18,7 @@
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.jvm" />
     <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.formatter" />
diff --git a/plugins/kotlin/refIndex/kotlin.refIndex.iml b/plugins/kotlin/refIndex/kotlin.refIndex.iml
index 8870205a3898..072edddd4fb8 100644
--- a/plugins/kotlin/refIndex/kotlin.refIndex.iml
+++ b/plugins/kotlin/refIndex/kotlin.refIndex.iml
@@ -11,7 +11,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.common" />
-    <orderEntry type="module" module-name="kotlin.jps-common" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />
diff --git a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/LookupStorageReader.kt b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/LookupStorageReader.kt
index e73df35b75c6..11e697383caa 100644
--- a/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/LookupStorageReader.kt
+++ b/plugins/kotlin/refIndex/src/org/jetbrains/kotlin/idea/search/refIndex/LookupStorageReader.kt
@@ -3,8 +3,6 @@ package org.jetbrains.kotlin.idea.search.refIndex
 
 import com.intellij.openapi.project.Project
 import com.intellij.util.io.*
-import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
-import org.jetbrains.kotlin.cli.common.toBooleanLenient
 import org.jetbrains.kotlin.idea.search.refIndex.KotlinCompilerReferenceIndexStorage.Companion.buildDataPaths
 import org.jetbrains.kotlin.idea.search.refIndex.KotlinCompilerReferenceIndexStorage.Companion.kotlinDataContainer
 import org.jetbrains.kotlin.incremental.storage.*
@@ -38,10 +36,9 @@ class LookupStorageReader private constructor(
         fun create(kotlinDataContainerPath: Path, projectPath: String): LookupStorageReader? {
             val lookupStoragePath = kotlinDataContainerPath.resolve(LOOKUP_STORAGE_NAME).takeIf { it.exists() } ?: return null
             val idToFileStoragePath = kotlinDataContainerPath.resolve(ID_TO_FILE_STORAGE_NAME).takeIf { it.exists() } ?: return null
-            val storeFullFqNames = CompilerSystemProperties.COMPILE_INCREMENTAL_WITH_CLASSPATH_SNAPSHOTS.value.toBooleanLenient() ?: false
             val lookupStorage = openReadOnlyPersistentHashMap(
                 lookupStoragePath,
-                LookupSymbolKeyDescriptor(storeFullFqNames),
+                LookupSymbolKeyDescriptor(storeFullFqNames = false),
                 IntCollectionExternalizer,
             )
 
diff --git a/plugins/kotlin/refIndex/tests/kotlin.refIndex.tests.iml b/plugins/kotlin/refIndex/tests/kotlin.refIndex.tests.iml
index b53c7f38f96c..2f3b24b1e197 100644
--- a/plugins/kotlin/refIndex/tests/kotlin.refIndex.tests.iml
+++ b/plugins/kotlin/refIndex/tests/kotlin.refIndex.tests.iml
@@ -16,7 +16,6 @@
     <orderEntry type="module" module-name="kotlin.refIndex" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.common" />
-    <orderEntry type="module" module-name="kotlin.jps-plugin" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.idea.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />
diff --git a/plugins/kotlin/repl/kotlin.repl.iml b/plugins/kotlin/repl/kotlin.repl.iml
index 2731f867a5be..c8d7cdc34a6d 100644
--- a/plugins/kotlin/repl/kotlin.repl.iml
+++ b/plugins/kotlin/repl/kotlin.repl.iml
@@ -11,7 +11,7 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
diff --git a/plugins/kotlin/resources-fir/resources/META-INF/analysisApiProviders.xml b/plugins/kotlin/resources-fir/resources/META-INF/analysisApiProviders.xml
index 1f5d581418a8..eb2ab08cbb06 100644
--- a/plugins/kotlin/resources-fir/resources/META-INF/analysisApiProviders.xml
+++ b/plugins/kotlin/resources-fir/resources/META-INF/analysisApiProviders.xml
@@ -3,6 +3,9 @@
     <projectService serviceInterface="org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProviderFactory"
                     serviceImplementation="org.jetbrains.kotlin.analysis.providers.ide.KotlinIdeDeclarationProviderFactory"/>
 
+    <projectService serviceInterface="org.jetbrains.kotlin.analysis.providers.KotlinAnnotationsResolverFactory"
+                    serviceImplementation="org.jetbrains.kotlin.analysis.providers.ide.KotlinIdeAnnotationsResolverFactory"/>
+
     <projectService serviceInterface="org.jetbrains.kotlin.analysis.providers.KotlinPackageProviderFactory"
                     serviceImplementation="org.jetbrains.kotlin.analysis.providers.ide.KotlinIdePackageProviderFactory"/>
 
diff --git a/plugins/kotlin/resources-fir/resources/META-INF/lightClasses.xml b/plugins/kotlin/resources-fir/resources/META-INF/lightClasses.xml
index ce90651c4244..8627619e3247 100644
--- a/plugins/kotlin/resources-fir/resources/META-INF/lightClasses.xml
+++ b/plugins/kotlin/resources-fir/resources/META-INF/lightClasses.xml
@@ -7,5 +7,9 @@
 
     <projectService serviceInterface="org.jetbrains.kotlin.asJava.LightClassGenerationSupport"
                     serviceImplementation="org.jetbrains.kotlin.idea.asJava.FirLightClassGenerationSupport"/>
+
+    <applicationService
+            serviceInterface="org.jetbrains.kotlin.analysis.decompiled.light.classes.origin.KotlinDeclarationInCompiledFileSearcher"
+            serviceImplementation="org.jetbrains.kotlin.analysis.decompiled.light.classes.fe10.KotlinDeclarationInCompiledFileSearcherFE10Impl"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/kotlin/resources-fir/resources/META-INF/plugin.xml b/plugins/kotlin/resources-fir/resources/META-INF/plugin.xml
index 9d3ceade9d8d..eee9fcda0abb 100644
--- a/plugins/kotlin/resources-fir/resources/META-INF/plugin.xml
+++ b/plugins/kotlin/resources-fir/resources/META-INF/plugin.xml
@@ -30,7 +30,12 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
   <depends optional="true" config-file="dep-copyright.xml">com.intellij.copyright</depends>
 <!--  <depends optional="true" config-file="dep-injection.xml">org.intellij.intelliLang</depends>-->
 
-  <xi:include href="indexes.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="navigation-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="highlighting-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="indices.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="file-types.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="language.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="formatter.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="jps.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="idea.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="project-wizard.xml" xpointer="xpointer(/idea-plugin/*)"/>
@@ -59,13 +64,19 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
   <!--  <xi:include href="kotlinx-serialization.xml" xpointer="xpointer(/idea-plugin/*)"/>-->
 
-    <xi:include href="scripting-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
+<!--    <xi:include href="scripting-support.xml" xpointer="xpointer(/idea-plugin/*)"/>-->
+
 
   <extensionPoints>
     <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
 
     <extensionPoint qualifiedName="org.jetbrains.kotlin.pluginUpdateVerifier"
                     interface="org.jetbrains.kotlin.idea.update.PluginUpdateVerifier"/>
+
+    <extensionPoint
+            qualifiedName="org.jetbrains.kotlin.buildSystemTypeDetector"
+            interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"
+            dynamic="true"/>
   </extensionPoints>
 
   <!--  <xi:include href="plugin-kotlin-extensions.xml" xpointer="xpointer(/idea-plugin/*)"/>-->
@@ -75,7 +86,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
   <!--  </extensions>-->
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <beforeResolveHighlightingVisitor implementation="org.jetbrains.kotlin.idea.fir.highlighter.visitors.DeclarationHighlightingExtension"/>
+    <beforeResolveHighlightingVisitor implementation="org.jetbrains.kotlin.idea.fir.highlighter.beforeResolve.DeclarationHighlightingExtension"/>
+    <beforeResolveHighlightingVisitor implementation="org.jetbrains.kotlin.idea.fir.highlighter.beforeResolve.AnnotationsHighlightingExtension"/>
     <binaryExtension implementation="org.jetbrains.kotlin.idea.util.JavaClassBinary"/>
     <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KotlinBuiltInBinary"/>
     <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KotlinModuleBinary"/>
@@ -96,8 +108,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
   <!--decompiler-->
   <extensions defaultExtensionNs="com.intellij">
-    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClassFileDecompiler"/>
-    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinClassFileDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInDecompiler"/>
   </extensions>
 <!--decompiler-->
 
@@ -125,6 +137,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
   </extensions>
 
   <extensions defaultExtensionNs="com.intellij">
+    <applicationService serviceImplementation="org.jetbrains.kotlin.idea.KotlinPluginUpdater"/>
+
     <!-- fir-specific -->
     <applicationService serviceInterface="org.jetbrains.kotlin.idea.base.KotlinPluginKindProvider"
                         serviceImplementation="org.jetbrains.kotlin.idea.fir.FirKotlinPluginKindProvider"/>
@@ -139,7 +153,7 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <statusBarWidgetFactory implementation="org.jetbrains.kotlin.idea.fir.FirStatusBarWidgetFactory"/>
     <highlightRangeExtension implementation="org.jetbrains.kotlin.idea.fir.highlighter.KotlinFirPsiChecker"/>
     <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.fir.highlighter.KotlinFirPsiChecker"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.FirIdeResolveStateService"/>
+    <projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirResolveStateService"/>
     <projectService serviceImplementation="org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.psi.KtFileClassProvider"
@@ -179,51 +193,16 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
                                implementationClass="org.jetbrains.kotlin.idea.parameterInfo.KotlinHighLevelClassTypeArgumentInfoHandler"/>
     <codeInsight.parameterInfo language="kotlin"
                                implementationClass="org.jetbrains.kotlin.idea.parameterInfo.KotlinHighLevelFunctionTypeArgumentInfoHandler"/>
-  </extensions>
-
-  <!--  scripts  -->
-  <extensionPoints>
-    <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptDefinitionsProvider"
-                    interface="kotlin.script.experimental.intellij.ScriptDefinitionsProvider"
-                    area="IDEA_PROJECT"/>
-    <extensionPoint qualifiedName="org.jetbrains.kotlin.scripting.idea.listener"
-                    interface="org.jetbrains.kotlin.idea.core.script.configuration.listener.ScriptChangeListener"
-                    area="IDEA_PROJECT"/>
-  </extensionPoints>
-  <extensions defaultExtensionNs="org.jetbrains.kotlin">
-    <scriptDefinitionContributor
-        id="ScriptTemplatesFromCompilerSettingsProvider"
-        implementation="org.jetbrains.kotlin.idea.script.ScriptTemplatesFromCompilerSettingsProvider"/>
-
-    <scriptDefinitionContributor
-        id="BridgeScriptDefinitionsContributor"
-        implementation="org.jetbrains.kotlin.idea.script.BridgeScriptDefinitionsContributor"/>
-
-    <scriptDefinitionContributor
-        id="ScriptTemplatesFromDependenciesProvider"
-        implementation="org.jetbrains.kotlin.idea.script.ScriptTemplatesFromDependenciesProvider"/>
 
-    <scriptDefinitionContributor id="StandardScriptDefinitionContributor"
-                                 order="last"
-                                 implementation="org.jetbrains.kotlin.idea.core.script.StandardScriptDefinitionContributor"/>
+    <targetElementEvaluator
+            language="kotlin"
+            implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator" />
 
-    <scriptDefinitionContributor id="ConsoleScriptDefinitionContributor"
-                                 implementation="org.jetbrains.kotlin.console.ConsoleScriptDefinitionContributor"/>
-
-    <scriptDefinitionsProvider id="MainKtsScriptDefinitionSource"
-                               implementation="org.jetbrains.kotlin.idea.script.MainKtsScriptDefinitionSource"/>
-  </extensions>
-  <extensions defaultExtensionNs="com.intellij">
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings"/>
-    <projectService serviceInterface="org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager"
-                    serviceImplementation="org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfigurationManager"/>
-    <projectService serviceInterface="org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionProvider"
-                    serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.core.script.ScriptDependenciesModificationTracker"/>
-    <java.elementFinder implementation="org.jetbrains.kotlin.idea.core.script.KotlinScriptDependenciesClassFinder"/>
+    <targetElementUtilExtender implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.FE10KotlinTargetElementEvaluator"/>
   </extensions>
 
-  <!-- scripts -->
+  <xi:include href="scripting-support.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
 
   <extensionPoints>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.resolveScopeEnlarger"
@@ -254,13 +233,17 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <applicationService serviceImplementation="org.jetbrains.kotlin.idea.completion.FirCompletionDummyIdentifierProviderService"
                         serviceInterface="org.jetbrains.kotlin.idea.completion.CompletionDummyIdentifierProviderService"/>
 
-    <postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>
+<!--    <postStartupActivity implementation="org.jetbrains.kotlin.idea.PluginStartupActivity"/>-->
+
+    <applicationService
+            serviceInterface="org.jetbrains.kotlin.psi.KotlinReferenceProvidersService"
+            serviceImplementation="org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService"/>
+
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.PluginStartupService"/>
 
     <iconProvider implementation="org.jetbrains.kotlin.idea.KotlinIconProviderBase"/>
 
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.IdePackageOracleFactory"/>
-    <projectService serviceImplementation="org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory"
                     serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinderFactory"/>
@@ -284,7 +267,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
     <java.elementFinder implementation="org.jetbrains.kotlin.asJava.finder.JavaElementFinder"/>
 
-
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.core.KotlinPluginDisposable"/>
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.core.util.ProjectJob"/>
 
     <elementDescriptionProvider
         implementation="org.jetbrains.kotlin.idea.findUsages.KotlinElementDescriptionProviderBase"
@@ -332,7 +316,7 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
               language="kotlin"
               extensions="kt;kts"/>
     <fileType name="kotlin_builtins"
-              implementationClass="org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType"
+              implementationClass="org.jetbrains.kotlin.analysis.decompiler.psi.KotlinBuiltInFileType"
               fieldName="INSTANCE"
               extensions="kotlin_builtins;kotlin_metadata"/>
 
@@ -348,6 +332,8 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
 
   <extensions defaultExtensionNs="com.intellij">
     <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-stdlib.jar;kotlin-stdlib-jdk7.jar;kotlin-stdlib-jdk8.jar;kotlin-reflect.jar;kotlin-plugin.jar;kotlin-jps-common.jar;kotlin-common.jar"/>
+    <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
+    <projectService serviceImplementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings"/>
 
     <applicationService serviceInterface="org.jetbrains.kotlin.idea.run.KotlinMainFunctionLocatingService"
                         serviceImplementation="org.jetbrains.kotlin.idea.run.KotlinFirMainFunctionLocatingService"/>
@@ -358,5 +344,6 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
     <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.script.standalone.KotlinStandaloneScriptRunConfigurationProducer"/>
 
     <runLineMarkerContributor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.fir.highlighter.KotlinFirMainRunLineMarkerContributor"/>
+    <pathMacroContributor implementation="org.jetbrains.kotlin.idea.KotlinPluginMacros"/>
   </extensions>
 </idea-plugin>
diff --git a/plugins/kotlin/scripting-support/kotlin.scripting-support.iml b/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
index 4eb90a1f5b35..fcf58285ddd0 100644
--- a/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
+++ b/plugins/kotlin/scripting-support/kotlin.scripting-support.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-scripting-compiler" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="kotlin.plugin" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.core" scope="TEST" />
diff --git a/plugins/kotlin/test-framework/kotlin.test-framework.iml b/plugins/kotlin/test-framework/kotlin.test-framework.iml
index 09a28b547b4e..a7dae5ea82d9 100644
--- a/plugins/kotlin/test-framework/kotlin.test-framework.iml
+++ b/plugins/kotlin/test-framework/kotlin.test-framework.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
     <orderEntry type="library" scope="TEST" name="Trove4j" level="project" />
     <orderEntry type="library" scope="TEST" name="TestNG" level="project" />
-    <orderEntry type="module" module-name="kotlin.jps-common" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.core" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" scope="TEST" />
diff --git a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
index 9b9e30ac15d0..575590e17ccf 100644
--- a/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
+++ b/plugins/kotlin/test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
@@ -290,6 +290,11 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix
         return configureByFile(relativePath)
     }
 
+    fun JavaCodeInsightTestFixture.configureByFiles(vararg file: File): List<PsiFile> {
+        val relativePaths = file.map { it.toRelativeString(testDataDirectory) }.toTypedArray()
+        return configureByFiles(*relativePaths).toList()
+    }
+
     fun JavaCodeInsightTestFixture.checkResultByFile(file: File) {
         val relativePath = file.toRelativeString(testDataDirectory)
         checkResultByFile(relativePath)
diff --git a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/KotlinTestUtils.java b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/KotlinTestUtils.java
index b63eb72f811b..f3087d2cfd8c 100644
--- a/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/KotlinTestUtils.java
+++ b/plugins/kotlin/tests-common/test/org/jetbrains/kotlin/idea/test/KotlinTestUtils.java
@@ -133,20 +133,29 @@ public class KotlinTestUtils {
     @NotNull
     public static File findAndroidSdk() {
         String androidSdkProp = System.getProperty("android.sdk");
-        File androidSdkDir = androidSdkProp == null ? null : new File(androidSdkProp);
-        String androidSdkEnv = System.getenv("ANDROID_HOME");
-        File androidSdkEnvDir = androidSdkEnv == null ? null : new File(androidSdkEnv);
-
-        if ((androidSdkDir == null || !androidSdkDir.isDirectory()) && (androidSdkEnvDir == null || !androidSdkEnvDir.isDirectory())) {
-            throw new RuntimeException(
-                    "Unable to get a valid path from 'android.sdk' property (" + androidSdkProp + "), " +
-                    "please point it to the android SDK location");
+        File androidSdkPropDir = androidSdkProp == null ? null : new File(androidSdkProp);
+
+        String androidHomeEnv = System.getenv("ANDROID_HOME");
+        File androidHomeEnvDir = androidHomeEnv == null ? null : new File(androidHomeEnv);
+
+        String androidSdkRootEnv = System.getenv("ANDROID_SDK_ROOT");
+        File androidSdkRootEnvDir = androidSdkRootEnv == null ? null : new File(androidSdkRootEnv);
+
+        if (androidSdkPropDir != null) {
+            return androidSdkPropDir;
         }
 
-        if (androidSdkDir != null) {
-            return androidSdkDir;
+        if (androidHomeEnvDir != null) {
+            return androidHomeEnvDir;
         }
-        return androidSdkEnvDir;
+
+        if (androidSdkRootEnvDir != null) {
+            return androidSdkRootEnvDir;
+        }
+
+        throw new RuntimeException(
+                "Unable to get a valid path from 'android.sdk' property (" + androidSdkProp + "), " +
+                "please point it to the android SDK location");
     }
 
     public static String getAndroidSdkSystemIndependentPath() {
@@ -686,7 +695,8 @@ public class KotlinTestUtils {
                     }
                 }
 
-                throw new AssertionError(String.format("Looks like this test can be unmuted. Remove \"%s%s\" directive.", ignoreDirective, targetBackend));
+                throw new AssertionError(
+                        String.format("Looks like this test can be unmuted. Remove \"%s%s\" directive.", ignoreDirective, targetBackend));
             }
         };
     }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
index 7915d756310c..b4cc704d6baa 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
+++ b/plugins/kotlin/uast/uast-kotlin-base/kotlin.uast.uast-kotlin-base.iml
@@ -31,13 +31,12 @@
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.java.rt" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.uast" />
-    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.uast.tests" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.tests-common" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-cli" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
-    <orderEntry type="module" module-name="kotlin.core" />
+    <!-- PLEASE DON'T ADD FRONTEND-SPECIFIC DEPENDENCIES: they should rather go to frontend variants, such as uast-kotlin(-fir) -->
   </component>
 </module>
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinConverter.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinConverter.kt
index b1a68df59e43..577c92fc3d94 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinConverter.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinConverter.kt
@@ -5,6 +5,7 @@ package org.jetbrains.uast.kotlin
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.psi.*
 import com.intellij.psi.impl.source.tree.LeafPsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.elements.*
@@ -25,6 +26,7 @@ import org.jetbrains.uast.internal.alternative
 import org.jetbrains.uast.expressions.UInjectionHost
 import org.jetbrains.uast.kotlin.psi.*
 
+@ApiStatus.Internal
 interface BaseKotlinConverter {
     val languagePlugin: UastLanguagePlugin
 
@@ -686,7 +688,7 @@ interface BaseKotlinConverter {
     fun createVarargsHolder(
         arguments: Collection<ValueArgument>,
         parent: UElement?,
-    ): KotlinUExpressionList =
+    ): UExpressionList =
         KotlinUExpressionList(null, UastSpecialExpressionKind.VARARGS, parent).apply {
             expressions = arguments.map { convertOrEmpty(it.getArgumentExpression(), parent) }
         }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinUastResolveProviderService.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinUastResolveProviderService.kt
index 432eea11b5c5..7391563defcb 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinUastResolveProviderService.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/BaseKotlinUastResolveProviderService.kt
@@ -18,6 +18,8 @@ interface BaseKotlinUastResolveProviderService {
 
     val baseKotlinConverter: BaseKotlinConverter
 
+    fun convertToPsiAnnotation(ktElement: KtElement): PsiAnnotation?
+
     fun convertParent(uElement: UElement): UElement? {
         return convertParentImpl(this, uElement)
     }
@@ -42,6 +44,8 @@ interface BaseKotlinUastResolveProviderService {
         includeExplicitParameters: Boolean = false
     ): List<KotlinUParameter>
 
+    fun getPsiAnnotations(psiElement: PsiModifierListOwner): Array<PsiAnnotation>
+
     // ----------
     // Resolution
     // ----------
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
index e25c098d22a8..b501d1d5f863 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
@@ -3,11 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.openapi.components.ServiceManager
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UastFacade
 import org.jetbrains.uast.UastLanguagePlugin
 import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments
 
+@ApiStatus.Internal
 abstract class KotlinAbstractUElement(
     givenParent: UElement?,
 ) : KotlinUElementWithComments {
@@ -16,7 +18,7 @@ abstract class KotlinAbstractUElement(
         psi?.let { UastFacade.findPlugin(it) }
     }
 
-    open val baseResolveProviderService: BaseKotlinUastResolveProviderService by lz {
+    val baseResolveProviderService: BaseKotlinUastResolveProviderService by lz {
         ServiceManager.getService(BaseKotlinUastResolveProviderService::class.java)
             ?: error("${BaseKotlinUastResolveProviderService::class.java.name} is not available for ${this::class.simpleName}")
     }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt
index 40ad85c82fa2..c0065d583ed7 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt
@@ -3,12 +3,14 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtAnnotatedExpression
 import org.jetbrains.uast.UAnnotation
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.convertOpt
 
+@ApiStatus.Internal
 abstract class KotlinAbstractUExpression(
     givenParent: UElement?,
 ) : KotlinAbstractUElement(givenParent), UExpression {
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt
index f960dd5af059..0fac67b2c553 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt
@@ -5,6 +5,7 @@ import com.intellij.openapi.components.ServiceManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtAnnotatedExpression
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtExpression
@@ -93,6 +94,7 @@ fun createElvisExpression(elvisExpression: KtBinaryExpression, givenParent: UEle
     return KotlinUElvisExpression(elvisExpression, left, right, givenParent)
 }
 
+@ApiStatus.Internal
 class KotlinUElvisExpression(
     private val elvisExpression: KtBinaryExpression,
     private val left: KtExpression,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUCatchClause.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUCatchClause.kt
index f8c315981374..99546301664b 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUCatchClause.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUCatchClause.kt
@@ -3,12 +3,14 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtCatchClause
 import org.jetbrains.uast.*
 import org.jetbrains.uast.internal.acceptList
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 class KotlinUCatchClause(
     override val sourcePsi: KtCatchClause,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUDoWhileExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUDoWhileExpression.kt
index 8dd0577cda82..d7144f9f49a7 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUDoWhileExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUDoWhileExpression.kt
@@ -2,11 +2,13 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtDoWhileExpression
 import org.jetbrains.uast.UDoWhileExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 
+@ApiStatus.Internal
 class KotlinUDoWhileExpression(
     override val sourcePsi: KtDoWhileExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUForEachExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUForEachExpression.kt
index 5ebe6926d405..62a34431f168 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUForEachExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUForEachExpression.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.psi.KtForExpression
 import org.jetbrains.uast.UElement
@@ -10,6 +11,7 @@ import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 import org.jetbrains.uast.psi.UastPsiParameterNotResolved
 
+@ApiStatus.Internal
 class KotlinUForEachExpression(
     override val sourcePsi: KtForExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt
index b4fb618c6e31..213bf1460e84 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt
@@ -2,11 +2,13 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.UIfExpression
 
+@ApiStatus.Internal
 class KotlinUIfExpression(
     override val sourcePsi: KtIfExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchEntry.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchEntry.kt
index ba81a93f3552..75daf9d559c8 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchEntry.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchEntry.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtWhenEntry
@@ -9,6 +10,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.kinds.KotlinSpecialExpressionKinds
 
+@ApiStatus.Internal
 class KotlinUSwitchEntry(
     override val sourcePsi: KtWhenEntry,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt
index 0ded104b4351..feadc6e0910b 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt
@@ -2,11 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtWhenExpression
 import org.jetbrains.uast.*
-import org.jetbrains.uast.kotlin.*
 import org.jetbrains.uast.kotlin.kinds.KotlinSpecialExpressionKinds
 
+@ApiStatus.Internal
 class KotlinUSwitchExpression(
     override val sourcePsi: KtWhenExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUTryExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUTryExpression.kt
index cce86bf205e0..b5594ac94f6f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUTryExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUTryExpression.kt
@@ -2,9 +2,11 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtTryExpression
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUTryExpression(
     override val sourcePsi: KtTryExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUWhileExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUWhileExpression.kt
index 981df98799cf..93ac0e42cb67 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUWhileExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUWhileExpression.kt
@@ -2,11 +2,13 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtWhileExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.UWhileExpression
 
+@ApiStatus.Internal
 class KotlinUWhileExpression(
     override val sourcePsi: KtWhileExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt
index 27c0d1466d2d..849428388f93 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtDelegatedSuperTypeEntry
@@ -10,6 +11,7 @@ import org.jetbrains.uast.*
 import org.jetbrains.uast.internal.acceptList
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 abstract class AbstractKotlinUClass(
     givenParent: UElement?
 ) : KotlinAbstractUElement(givenParent), UClass, UAnchorOwner {
@@ -23,17 +25,19 @@ abstract class AbstractKotlinUClass(
         }
     }
 
-    open val ktClass: KtClassOrObject? get() = (psi as? KtLightClass)?.kotlinOrigin
+    protected open val ktClass: KtClassOrObject?
+        get() = (psi as? KtLightClass)?.kotlinOrigin
 
     override val uastSuperTypes: List<UTypeReferenceExpression>
         get() = ktClass?.superTypeListEntries.orEmpty().mapNotNull { it.typeReference }.map {
             KotlinUTypeReferenceExpression(it, this)
         }
 
-    val delegateExpressions: List<UExpression>
-        get() = ktClass?.superTypeListEntries.orEmpty()
+    private val delegateExpressions: List<UExpression> by lz {
+        ktClass?.superTypeListEntries.orEmpty()
             .filterIsInstance<KtDelegatedSuperTypeEntry>()
             .map { KotlinSupertypeDelegationUExpression(it, this) }
+    }
 
     override fun accept(visitor: UastVisitor) {
         if (visitor.visitClass(this)) return
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt
index cfb3ffd55a90..f54c5d8316b3 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightAbstractAnnotation
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
@@ -13,6 +14,7 @@ import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable
 
+@ApiStatus.Internal
 abstract class AbstractKotlinUVariable(
     givenParent: UElement?
 ) : KotlinAbstractUElement(givenParent), PsiVariable, UVariableEx, UAnchorOwner {
@@ -36,7 +38,7 @@ abstract class AbstractKotlinUVariable(
             return languagePlugin?.convertElement(initializerExpression, this) as? UExpression ?: UastEmptyExpression(null)
         }
 
-    val delegateExpression: UExpression? by lz {
+    protected val delegateExpression: UExpression? by lz {
         val psi = psi
         val expression = when (psi) {
             is KtLightElement<*, *> -> (psi.kotlinOrigin as? KtProperty)?.delegateExpression
@@ -103,7 +105,7 @@ abstract class AbstractKotlinUVariable(
             psi.parameterList.attributes.map { WrappedUNamedExpression(it, this) }
         }
 
-        override val uastAnchor by lazy {
+        override val uastAnchor: UIdentifier by lz {
             KotlinUIdentifier(
                 { javaPsi.nameReferenceElement?.referenceNameElement },
                 sourcePsi.safeAs<KtAnnotationEntry>()?.typeReference?.nameElement,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt
index 9e21ce02503c..c3514b55f31d 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiMethod
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.utils.SmartList
@@ -11,6 +12,7 @@ import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UIdentifier
 
+@ApiStatus.Internal
 open class KotlinConstructorUMethod(
     private val ktClass: KtClassOrObject?,
     override val psi: PsiMethod,
@@ -26,7 +28,7 @@ open class KotlinConstructorUMethod(
 
     override val javaPsi = psi
 
-    val isPrimary: Boolean
+    internal val isPrimary: Boolean
         get() = sourcePsi is KtPrimaryConstructor || sourcePsi is KtClassOrObject
 
     override val uastBody: UExpression? by lz {
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinInvalidUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinInvalidUClass.kt
index bebdb99fcc6f..b60d2de85fbd 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinInvalidUClass.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinInvalidUClass.kt
@@ -6,12 +6,14 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.impl.light.LightPsiClassBuilder
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.uast.*
 
 /**
  * implementation of [UClass] for invalid code, when it is impossible to create a [KtLightClass]
  */
+@ApiStatus.Internal
 class KotlinInvalidUClass(
     override val psi: PsiClass,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinNullabilityUAnnotation.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinNullabilityUAnnotation.kt
index 5e0bab733cac..c912fca2d250 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinNullabilityUAnnotation.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinNullabilityUAnnotation.kt
@@ -6,12 +6,14 @@ import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.NotNull
 import org.jetbrains.annotations.Nullable
 import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinNullabilityUAnnotation(
     private val baseKotlinUastResolveProviderService: BaseKotlinUastResolveProviderService,
     val annotatedElement: PsiElement,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinReceiverUParameter.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinReceiverUParameter.kt
index 44b1481c44f0..2d07a2c7405b 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinReceiverUParameter.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinReceiverUParameter.kt
@@ -2,11 +2,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiParameter
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.KtTypeReference
 import org.jetbrains.uast.UAnnotation
 import org.jetbrains.uast.UElement
 
+@ApiStatus.Internal
 class KotlinReceiverUParameter(
     psi: PsiParameter,
     private val receiver: KtTypeReference,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt
index 32cdd27d3974..f6589e04affb 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt
@@ -5,6 +5,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForScript
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -12,6 +13,7 @@ import org.jetbrains.kotlin.psi.KtScript
 import org.jetbrains.kotlin.psi.KtScriptInitializer
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinScriptUClass(
     psi: KtLightClassForScript,
     givenParent: UElement?
@@ -20,7 +22,7 @@ class KotlinScriptUClass(
 
     override fun getNameIdentifier(): PsiIdentifier = UastLightIdentifier(psi, psi.kotlinOrigin)
 
-    override val uastAnchor by lazy { KotlinUIdentifier(nameIdentifier, sourcePsi?.nameIdentifier, this) }
+    override val uastAnchor: UIdentifier by lz { KotlinUIdentifier(nameIdentifier, sourcePsi?.nameIdentifier, this) }
 
     override val javaPsi: PsiClass = psi
 
@@ -50,6 +52,7 @@ class KotlinScriptUClass(
 
     override fun getOriginalElement(): PsiElement? = psi.originalElement
 
+    @ApiStatus.Internal
     class KotlinScriptConstructorUMethod(
         script: KtScript,
         override val psi: KtLightMethod,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinSecondaryConstructorWithInitializersUMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinSecondaryConstructorWithInitializersUMethod.kt
index 9db4147640e6..5d0ba29bfbf0 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinSecondaryConstructorWithInitializersUMethod.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinSecondaryConstructorWithInitializersUMethod.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtExpression
@@ -10,6 +11,7 @@ import org.jetbrains.uast.UElement
 // This class was created as a workaround for KT-21617 to be the only constructor which includes `init` block
 // when there is no primary constructors in the class.
 // It is expected to have only one constructor of this type in a UClass.
+@ApiStatus.Internal
 class KotlinSecondaryConstructorWithInitializersUMethod(
     ktClass: KtClassOrObject?,
     psi: KtLightMethod,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotatedLocalVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotatedLocalVariable.kt
index 383b6204a173..0d0023143e8b 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotatedLocalVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotatedLocalVariable.kt
@@ -2,10 +2,12 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiLocalVariable
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.uast.UAnnotation
 import org.jetbrains.uast.UElement
 
+@ApiStatus.Internal
 open class KotlinUAnnotatedLocalVariable(
     psi: PsiLocalVariable,
     sourcePsi: KtElement,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt
index 5bea2bb5c638..4e659c233d6f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt
@@ -6,17 +6,15 @@ import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.ResolveResult
-import org.jetbrains.kotlin.asJava.toLightAnnotation
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
-import org.jetbrains.kotlin.idea.util.actionUnderSafeAnalyzeBlock
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
-import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.multiResolveResults
 
+@ApiStatus.Internal
 sealed class KotlinUAnnotationBase<T : KtCallElement>(
     final override val sourcePsi: T,
     givenParent: UElement?
@@ -72,13 +70,14 @@ sealed class KotlinUAnnotationBase<T : KtCallElement>(
     override fun multiResolve(): Iterable<ResolveResult> = sourcePsi.multiResolveResults().asIterable()
 }
 
+@ApiStatus.Internal
 class KotlinUAnnotation(
     annotationEntry: KtAnnotationEntry,
     givenParent: UElement?
 ) : KotlinUAnnotationBase<KtAnnotationEntry>(annotationEntry, givenParent), UAnnotation {
 
     override val javaPsi: PsiAnnotation? by lz {
-        annotationEntry.actionUnderSafeAnalyzeBlock({ annotationEntry.toLightAnnotation() }, { null })
+        baseResolveProviderService.convertToPsiAnnotation(annotationEntry)
     }
 
     override fun annotationUseSiteTarget() = sourcePsi.useSiteTarget?.getAnnotationUseSiteTarget()
@@ -87,7 +86,7 @@ class KotlinUAnnotation(
         return baseResolveProviderService.resolveToClass(sourcePsi, this)
     }
 
-    override val uastAnchor by lz {
+    override val uastAnchor: UIdentifier by lz {
         KotlinUIdentifier(
             javaPsi?.nameReferenceElement,
             annotationEntry.typeReference?.nameElement,
@@ -97,12 +96,15 @@ class KotlinUAnnotation(
 
 }
 
+@ApiStatus.Internal
 class KotlinUNestedAnnotation private constructor(
     original: KtCallExpression,
     givenParent: UElement?
 ) : KotlinUAnnotationBase<KtCallExpression>(original, givenParent) {
 
-    override val javaPsi: PsiAnnotation? by lz { original.toLightAnnotation() }
+    override val javaPsi: PsiAnnotation? by lz {
+        baseResolveProviderService.convertToPsiAnnotation(original)
+    }
 
     override fun annotationUseSiteTarget(): AnnotationUseSiteTarget? = null
 
@@ -110,7 +112,7 @@ class KotlinUNestedAnnotation private constructor(
         return baseResolveProviderService.resolveToClassIfConstructorCall(sourcePsi, this)
     }
 
-    override val uastAnchor by lz {
+    override val uastAnchor: UIdentifier by lz {
         KotlinUIdentifier(
             javaPsi?.nameReferenceElement?.referenceNameElement,
             (original.calleeExpression as? KtNameReferenceExpression)?.getReferencedNameElement(),
@@ -129,5 +131,3 @@ class KotlinUNestedAnnotation private constructor(
     }
 
 }
-
-
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotationMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotationMethod.kt
index a01309976b63..64f1a09dbad0 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotationMethod.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotationMethod.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUAnnotationMethod(
     psi: KtLightMethod,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt
index 723431117a22..d1d5649e61fc 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt
@@ -5,11 +5,13 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiAnonymousClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUAnonymousClass(
     psi: PsiAnonymousClass,
     givenParent: UElement?
@@ -31,8 +33,8 @@ class KotlinUAnonymousClass(
 
     override fun getContainingFile(): PsiFile = unwrapFakeFileForLightClass(psi.containingFile)
 
-    override val uastAnchor by lazy {
-        val ktClassOrObject = (psi.originalElement as? KtLightClass)?.kotlinOrigin as? KtObjectDeclaration ?: return@lazy null
+    override val uastAnchor: UIdentifier? by lz {
+        val ktClassOrObject = (psi.originalElement as? KtLightClass)?.kotlinOrigin as? KtObjectDeclaration ?: return@lz null
         KotlinUIdentifier(ktClassOrObject.getObjectKeyword(), this)
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
index a8a0ff24bdd6..6b4321f336e4 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForScript
@@ -14,6 +15,7 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUClass(
     psi: KtLightClass,
     givenParent: UElement?
@@ -34,7 +36,9 @@ class KotlinUClass(
 
     override fun getContainingFile(): PsiFile = unwrapFakeFileForLightClass(psi.containingFile)
 
-    override val uastAnchor by lazy { getIdentifierSourcePsi()?.let { KotlinUIdentifier(nameIdentifier, it, this) } }
+    override val uastAnchor: UIdentifier? by lz {
+        getIdentifierSourcePsi()?.let { KotlinUIdentifier(nameIdentifier, it, this) }
+    }
 
     private fun getIdentifierSourcePsi(): PsiElement? {
         ktClass?.nameIdentifier?.let { return it }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt
index de5d801cb459..97b480d86945 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt
@@ -3,6 +3,7 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiTypesUtil
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.KtElement
@@ -11,6 +12,7 @@ import org.jetbrains.kotlin.psi.KtSuperTypeCallEntry
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUEnumConstant(
     psi: PsiEnumConstant,
     override val sourcePsi: KtElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt
index 6bebb0ab0ac1..b037a50dcde5 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtProperty
@@ -11,6 +12,7 @@ import org.jetbrains.uast.UFieldEx
 import org.jetbrains.uast.internal.acceptList
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 open class KotlinUField(
     psi: PsiField,
     override val sourcePsi: KtElement?,
@@ -22,6 +24,10 @@ open class KotlinUField(
 
     override val psi = javaPsi
 
+    override fun getType(): PsiType {
+        return delegateExpression?.getExpressionType() ?: javaPsi.type
+    }
+
     override fun acceptsAnnotationTarget(target: AnnotationUseSiteTarget?): Boolean =
         target == AnnotationUseSiteTarget.FIELD ||
                 target == AnnotationUseSiteTarget.PROPERTY_DELEGATE_FIELD ||
@@ -54,4 +60,21 @@ open class KotlinUField(
         delegateExpression?.accept(visitor)
         visitor.afterVisitField(this)
     }
+
+    override fun asRenderString(): String = buildString {
+        if (uAnnotations.isNotEmpty()) {
+            uAnnotations.joinTo(this, separator = " ", postfix = " ") { it.asRenderString() }
+        }
+        append(javaPsi.renderModifiers())
+        // NB: use of (potentially delegated) `type`, instead of `javaPsiInternal.type`, is the only major difference.
+        append("var ").append(javaPsi.name).append(": ").append(type.getCanonicalText(false))
+        uastInitializer?.let { initializer -> append(" = " + initializer.asRenderString()) }
+    }
+}
+
+// copy of internal org.jetbrains.uast.InternalUastUtilsKt.renderModifiers
+// original function should be used instead as soon as becomes public
+private fun PsiModifierListOwner.renderModifiers(): String {
+    val modifiers = PsiModifier.MODIFIERS.filter { hasModifierProperty(it) }.joinToString(" ")
+    return if (modifiers.isEmpty()) "" else modifiers + " "
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUFile.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUFile.kt
index 9f3b9a3ede57..7737582d0006 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUFile.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUFile.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.findFacadeClass
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -11,6 +12,7 @@ import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments
 import java.util.ArrayList
 
+@ApiStatus.Internal
 class KotlinUFile(
     override val psi: KtFile,
     override val languagePlugin: UastLanguagePlugin
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUIdentifier.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUIdentifier.kt
index f5a49a9f8a4a..fad4bb63366b 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUIdentifier.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUIdentifier.kt
@@ -5,6 +5,7 @@ package org.jetbrains.uast.kotlin
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
@@ -12,7 +13,8 @@ import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.toUElement
 
-class KotlinUIdentifier constructor(
+@ApiStatus.Internal
+class KotlinUIdentifier(
     javaPsiSupplier: () -> PsiElement?,
     override val sourcePsi: PsiElement?,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUImportStatement.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUImportStatement.kt
index a2748915bee0..795c124fd6a3 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUImportStatement.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUImportStatement.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.KtReferenceExpression
@@ -12,6 +13,7 @@ import org.jetbrains.uast.UImportStatement
 import org.jetbrains.uast.USimpleNameReferenceExpression
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUImportStatement(
     override val psi: KtImportDirective,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt
index 62c0eb1eb1eb..16c874fd5204 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.uast.UElement
@@ -10,6 +11,7 @@ import org.jetbrains.uast.ULocalVariableEx
 import org.jetbrains.uast.internal.acceptList
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 open class KotlinULocalVariable(
     psi: PsiLocalVariable,
     override val sourcePsi: KtElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
index d9bb66cc0e67..2763177d99ab 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
@@ -7,11 +7,11 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiNameIdentifierOwner
 import com.intellij.psi.PsiParameter
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
 import org.jetbrains.kotlin.asJava.elements.KtLightMethod
 import org.jetbrains.kotlin.asJava.elements.isGetter
 import org.jetbrains.kotlin.asJava.elements.isSetter
-import org.jetbrains.kotlin.idea.util.actionUnderSafeAnalyzeBlock
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.utils.SmartList
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 
+@ApiStatus.Internal
 open class KotlinUMethod(
     psi: PsiMethod,
     final override val sourcePsi: KtDeclaration?,
@@ -61,7 +62,9 @@ open class KotlinUMethod(
     override fun getNameIdentifier() = UastLightIdentifier(psi, kotlinOrigin)
 
     override val uAnnotations: List<UAnnotation> by lz {
-        psi.actionUnderSafeAnalyzeBlock({ psi.annotations }, { emptyArray<PsiAnnotation>() })
+        // NB: we can't use sourcePsi.annotationEntries directly due to annotation use-site targets. The given `psi` as a light element,
+        // which spans regular function, property accessors, etc., is already built with targeted annotation.
+        baseResolveProviderService.getPsiAnnotations(psi)
             .mapNotNull { (it as? KtLightElement<*, *>)?.kotlinOrigin as? KtAnnotationEntry }
             .map { baseResolveProviderService.baseKotlinConverter.convertAnnotation(it, this) }
     }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethodWithFakeLightDelegate.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethodWithFakeLightDelegate.kt
index 3895b7fef965..6735950dad06 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethodWithFakeLightDelegate.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethodWithFakeLightDelegate.kt
@@ -4,10 +4,12 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastFakeLightMethod
 
+@ApiStatus.Internal
 class KotlinUMethodWithFakeLightDelegate(
     val original: KtFunction,
     fakePsi: UastFakeLightMethod,
@@ -17,13 +19,12 @@ class KotlinUMethodWithFakeLightDelegate(
     constructor(original: KtFunction, containingLightClass: PsiClass, givenParent: UElement?)
             : this(original, UastFakeLightMethod(original, containingLightClass), givenParent)
 
-    private val _annotations: List<UAnnotation> by lz {
-        original.annotationEntries.mapNotNull { it.toUElementOfType() }
+    override val uAnnotations: List<UAnnotation> by lz {
+        original.annotationEntries.map {
+            baseResolveProviderService.baseKotlinConverter.convertAnnotation(it, this)
+        }
     }
 
-    override val uAnnotations: List<UAnnotation>
-        get() = _annotations
-
     override fun getTextRange(): TextRange {
         return original.textRange
     }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt
index 3ce042b57426..3b12d85d68de 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt
@@ -2,6 +2,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
@@ -9,6 +10,7 @@ import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UParameter
 import org.jetbrains.uast.UParameterEx
 
+@ApiStatus.Internal
 open class KotlinUParameter(
     psi: PsiParameter,
     final override val sourcePsi: KtElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
index 8ee45e2ab1f1..14842d4f8f95 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
@@ -2,11 +2,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UVariable
 
+@ApiStatus.Internal
 class KotlinUVariable(
     psi: PsiVariable,
     override val sourcePsi: KtElement,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/UastLightIdentifier.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/UastLightIdentifier.kt
index c75f7c0bc991..884fb4f9f9a7 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/UastLightIdentifier.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/UastLightIdentifier.kt
@@ -4,15 +4,11 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiNameIdentifierOwner
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KtLightIdentifier
-import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
-import org.jetbrains.uast.UElement
-import org.jetbrains.uast.UIdentifier
-import org.jetbrains.uast.kotlin.createKDocNameSimpleNameReference
-import org.jetbrains.uast.toUElement
 
+@ApiStatus.Internal
 class UastLightIdentifier(
     lightOwner: PsiNameIdentifierOwner,
     ktDeclaration: KtDeclaration?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinClassViaConstructorUSimpleReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinClassViaConstructorUSimpleReferenceExpression.kt
index ef1c8be61bd1..4ead113ceede 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinClassViaConstructorUSimpleReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinClassViaConstructorUSimpleReferenceExpression.kt
@@ -8,12 +8,14 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiNamedElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtCallElement
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.USimpleNameReferenceExpression
 import org.jetbrains.uast.internal.log
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 class KotlinClassViaConstructorUSimpleReferenceExpression(
     override val sourcePsi: KtCallElement,
     override val identifier: String,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpression.kt
index b6f4f9e7b1fe..83118d956889 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpression.kt
@@ -3,8 +3,10 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinCustomUBinaryExpression(
     override val psi: PsiElement,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpressionWithType.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpressionWithType.kt
index e4865ea9b22d..4d882b716401 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpressionWithType.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinCustomUBinaryExpressionWithType.kt
@@ -4,8 +4,10 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinCustomUBinaryExpressionWithType(
     override val psi: PsiElement,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt
index 7b90400199f3..80874dfdfcbe 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt
@@ -4,10 +4,12 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.ResolveResult
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocName
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.multiResolveResults
 
+@ApiStatus.Internal
 class KotlinDocUQualifiedReferenceExpression(
     override val sourcePsi: KDocName,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinEvaluatableUElement.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinEvaluatableUElement.kt
index 50a668aaaa34..1e4cfafb228f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinEvaluatableUElement.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinEvaluatableUElement.kt
@@ -2,8 +2,10 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UExpression
 
+@ApiStatus.Internal
 interface KotlinEvaluatableUElement : UExpression {
     val baseResolveProviderService: BaseKotlinUastResolveProviderService
 
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLazyUBlockExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLazyUBlockExpression.kt
index 542d6797b461..f688e5814910 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLazyUBlockExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLazyUBlockExpression.kt
@@ -3,9 +3,11 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtAnonymousInitializer
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinLazyUBlockExpression(
     override val uastParent: UElement?,
     expressionProducer: (expressionParent: UElement) -> List<UExpression>
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionULambdaExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionULambdaExpression.kt
index 6df44b2f5a91..a0666bf2fd04 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionULambdaExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionULambdaExpression.kt
@@ -2,10 +2,12 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 
+@ApiStatus.Internal
 class KotlinLocalFunctionULambdaExpression(
     override val sourcePsi: KtFunction,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt
index eba344dfd714..0de28430da5a 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt
@@ -4,10 +4,12 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiExpression
 import com.intellij.psi.PsiVariable
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtFunction
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable
 
+@ApiStatus.Internal
 class KotlinLocalFunctionUVariable(
     val function: KtFunction,
     override val javaPsi: PsiVariable,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt
index 50d38665bce7..450e371f4966 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt
@@ -3,10 +3,12 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiLanguageInjectionHost
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtStringTemplateExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.expressions.UInjectionHost
 
+@ApiStatus.Internal
 class KotlinStringTemplateUPolyadicExpression(
     override val sourcePsi: KtStringTemplateExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt
index 46326bd2343f..f461e8a62ede 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt
@@ -4,12 +4,14 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtEscapeStringTemplateEntry
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.ULiteralExpression
 import org.jetbrains.uast.kotlin.internal.KotlinFakeUElement
 import org.jetbrains.uast.wrapULiteral
 
+@ApiStatus.Internal
 class KotlinStringULiteralExpression(
     override val sourcePsi: PsiElement,
     givenParent: UElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt
index 992e59faa3e3..2b045ac0fdc6 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt
@@ -4,12 +4,14 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.ResolveResult
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UMultiResolvable
 import org.jetbrains.uast.USimpleNameReferenceExpression
 import org.jetbrains.uast.kotlin.internal.multiResolveResults
 
+@ApiStatus.Internal
 class KotlinStringUSimpleReferenceExpression(
     override val identifier: String,
     givenParent: UElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinSupertypeDelegationUExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinSupertypeDelegationUExpression.kt
index f5fd256d2a39..cd7e6adbee0f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinSupertypeDelegationUExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinSupertypeDelegationUExpression.kt
@@ -3,10 +3,12 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtDelegatedSuperTypeEntry
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.kinds.KotlinSpecialExpressionKinds
 
+@ApiStatus.Internal
 class KotlinSupertypeDelegationUExpression(
     override val sourcePsi: KtDelegatedSuperTypeEntry,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUArrayAccessExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUArrayAccessExpression.kt
index b3413b3a6379..d0bbed38c55c 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUArrayAccessExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUArrayAccessExpression.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtArrayAccessExpression
 import org.jetbrains.uast.UArrayAccessExpression
 import org.jetbrains.uast.UElement
 
+@ApiStatus.Internal
 class KotlinUArrayAccessExpression(
     override val sourcePsi: KtArrayAccessExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
index df2111bf3787..8dca70bd539e 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiMethod
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.uast.UBinaryExpression
@@ -10,6 +11,7 @@ import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.UastBinaryOperator
 
+@ApiStatus.Internal
 class KotlinUBinaryExpression(
     override val sourcePsi: KtBinaryExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt
index f9d0c0c31151..63942059b773 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpressionWithTypeRHS
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUBinaryExpressionWithType(
     override val sourcePsi: KtBinaryExpressionWithTypeRHS,
     givenParent: UElement?
@@ -20,7 +22,7 @@ class KotlinUBinaryExpressionWithType(
         } ?: UastErrorType
     }
 
-    override val typeReference by lz {
+    override val typeReference: UTypeReferenceExpression? by lz {
         sourcePsi.right?.let {
             KotlinUTypeReferenceExpression(it, this) { type }
         }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt
index a9016b7debd3..0b49476d67a2 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBlockExpression.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtAnonymousInitializer
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.uast.UBlockExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.getContainingUClass
 
+@ApiStatus.Internal
 open class KotlinUBlockExpression(
     override val sourcePsi: KtBlockExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBreakExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBreakExpression.kt
index 4a4d7b3e305a..671c80964cbd 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBreakExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBreakExpression.kt
@@ -2,11 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtBreakExpression
 import org.jetbrains.uast.UBreakExpression
 import org.jetbrains.uast.UElement
-import org.jetbrains.uast.kotlin.KotlinAbstractUExpression
 
+@ApiStatus.Internal
 class KotlinUBreakExpression(
     override val sourcePsi: KtBreakExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
index 7aa1c5b48ca8..fb7e30781aa6 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCallableReferenceExpression.kt
@@ -5,10 +5,12 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.ResolveResult
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.getResolveResultVariants
 
+@ApiStatus.Internal
 class KotlinUCallableReferenceExpression(
     override val sourcePsi: KtCallableReferenceExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUClassLiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUClassLiteralExpression.kt
index 454486b4f3b4..3840f257291d 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUClassLiteralExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUClassLiteralExpression.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtClassLiteralExpression
 import org.jetbrains.uast.DEFAULT_EXPRESSION_TYPES_LIST
 import org.jetbrains.uast.UClassLiteralExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 
+@ApiStatus.Internal
 class KotlinUClassLiteralExpression(
     override val sourcePsi: KtClassLiteralExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCollectionLiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCollectionLiteralExpression.kt
index 6832ab6b4814..b9f27b0818af 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCollectionLiteralExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUCollectionLiteralExpression.kt
@@ -6,10 +6,12 @@ import com.intellij.psi.PsiArrayType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtCollectionLiteralExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUCollectionLiteralExpression(
     override val sourcePsi: KtCollectionLiteralExpression,
     givenParent: UElement?
@@ -19,7 +21,7 @@ class KotlinUCollectionLiteralExpression(
 
     override val kind: UastCallKind = UastCallKind.NESTED_ARRAY_INITIALIZER
 
-    override val methodIdentifier: UIdentifier? by lazy { UIdentifier(sourcePsi.leftBracket, this) }
+    override val methodIdentifier: UIdentifier? by lz { UIdentifier(sourcePsi.leftBracket, this) }
 
     override val methodName: String? get() = null
 
@@ -36,7 +38,7 @@ class KotlinUCollectionLiteralExpression(
     override val valueArgumentCount: Int
         get() = sourcePsi.getInnerExpressions().size
 
-    override val valueArguments by lazy {
+    override val valueArguments by lz {
         sourcePsi.getInnerExpressions().map {
             baseResolveProviderService.baseKotlinConverter.convertOrEmpty(it, this)
         }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUContinueExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUContinueExpression.kt
index 32eeab3d30b6..f5385b2cef69 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUContinueExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUContinueExpression.kt
@@ -2,11 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtContinueExpression
 import org.jetbrains.uast.UContinueExpression
 import org.jetbrains.uast.UElement
-import org.jetbrains.uast.kotlin.KotlinAbstractUExpression
 
+@ApiStatus.Internal
 class KotlinUContinueExpression(
     override val sourcePsi: KtContinueExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDeclarationsExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDeclarationsExpression.kt
index 2cee06b32154..c3bf4f6b38cc 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDeclarationsExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDeclarationsExpression.kt
@@ -1,9 +1,13 @@
 // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package org.jetbrains.uast
+package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.uast.kotlin.KotlinAbstractUExpression
+import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.uast.UDeclaration
+import org.jetbrains.uast.UDeclarationsExpression
+import org.jetbrains.uast.UElement
 
+@ApiStatus.Internal
 open class KotlinUDeclarationsExpression(
     override val psi: PsiElement?,
     givenParent: UElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt
index 609e1941ecfb..07d58b7b8560 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt
@@ -3,9 +3,10 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.uast.KotlinUDeclarationsExpression
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UElement
 
+@ApiStatus.Internal
 class KotlinUDestructuringDeclarationExpression(
     givenParent: UElement?,
     psiAnchor: PsiElement,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUElementWithType.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUElementWithType.kt
index 7d7b8dc948ba..1c99531eba7a 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUElementWithType.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUElementWithType.kt
@@ -3,9 +3,11 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.uast.UExpression
 
+@ApiStatus.Internal
 interface KotlinUElementWithType : UExpression {
     val baseResolveProviderService: BaseKotlinUastResolveProviderService
 
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt
index 19dbbca219ed..3318407cbb9c 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt
@@ -3,12 +3,14 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UExpressionList
 import org.jetbrains.uast.UastSpecialExpressionKind
 import org.jetbrains.uast.kotlin.kinds.KotlinSpecialExpressionKinds
 
+@ApiStatus.Internal
 open class KotlinUExpressionList(
     override val sourcePsi: PsiElement?,
     override val kind: UastSpecialExpressionKind, // original element
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUFunctionCallExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUFunctionCallExpression.kt
index 16c5c76d303e..c187120c6eaa 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUFunctionCallExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUFunctionCallExpression.kt
@@ -4,12 +4,14 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiTypesUtil
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.uast.*
 import org.jetbrains.uast.internal.acceptList
 import org.jetbrains.uast.kotlin.internal.TypedResolveResult
 import org.jetbrains.uast.visitor.UastVisitor
 
+@ApiStatus.Internal
 class KotlinUFunctionCallExpression(
     override val sourcePsi: KtCallElement,
     givenParent: UElement?,
@@ -23,11 +25,11 @@ class KotlinUFunctionCallExpression(
         baseResolveProviderService.resolvedFunctionName(sourcePsi)
     }
 
-    override val classReference by lz {
+    override val classReference: UReferenceExpression by lz {
         KotlinClassViaConstructorUSimpleReferenceExpression(sourcePsi, methodName.orAnonymous("class"), this)
     }
 
-    override val methodIdentifier by lz {
+    override val methodIdentifier: UIdentifier? by lz {
         if (sourcePsi is KtSuperTypeCallEntry) {
             ((sourcePsi.parent as? KtInitializerList)?.parent as? KtEnumEntry)?.let { ktEnumEntry ->
                 return@lz KotlinUIdentifier(ktEnumEntry.nameIdentifier, this)
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUImplicitReturnExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUImplicitReturnExpression.kt
index 35816a49fab7..7e072f45fbc3 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUImplicitReturnExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUImplicitReturnExpression.kt
@@ -3,11 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UReturnExpression
 import org.jetbrains.uast.kotlin.internal.KotlinFakeUElement
 
+@ApiStatus.Internal
 class KotlinUImplicitReturnExpression(
     givenParent: UElement?,
 ) : KotlinAbstractUExpression(givenParent), UReturnExpression, KotlinUElementWithType, KotlinFakeUElement {
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULabeledExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULabeledExpression.kt
index 21868f00b998..e3d78eb502a4 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULabeledExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULabeledExpression.kt
@@ -2,11 +2,13 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtLabeledExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.ULabeledExpression
 
+@ApiStatus.Internal
 class KotlinULabeledExpression(
     override val sourcePsi: KtLabeledExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULambdaExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULambdaExpression.kt
index ffcf9e7ed130..261ef717119f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULambdaExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULambdaExpression.kt
@@ -3,11 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtLambdaExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 
+@ApiStatus.Internal
 class KotlinULambdaExpression(
     override val sourcePsi: KtLambdaExpression,
     givenParent: UElement?
@@ -20,7 +22,11 @@ class KotlinULambdaExpression(
         sourcePsi.bodyExpression?.let { Body(it, this) } ?: UastEmptyExpression(this)
     }
 
-    class Body(bodyExpression: KtBlockExpression, parent: KotlinULambdaExpression) : KotlinUBlockExpression(bodyExpression, parent) {
+    @ApiStatus.Internal
+    class Body(
+        bodyExpression: KtBlockExpression,
+        parent: KotlinULambdaExpression
+    ) : KotlinUBlockExpression(bodyExpression, parent) {
 
         override val expressions: List<UExpression> by lz {
             val statements = sourcePsi.statements
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULiteralExpression.kt
index d0922d5d98ca..9f92c2dec0da 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULiteralExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinULiteralExpression.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.KtNodeTypes
 import org.jetbrains.kotlin.psi.KtConstantExpression
 import org.jetbrains.uast.UElement
@@ -10,6 +11,7 @@ import org.jetbrains.uast.ULiteralExpression
 import org.jetbrains.uast.kotlin.internal.KotlinFakeUElement
 import org.jetbrains.uast.wrapULiteral
 
+@ApiStatus.Internal
 class KotlinULiteralExpression(
     override val sourcePsi: KtConstantExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt
index 5716eb82328b..41693f321540 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUNamedExpression.kt
@@ -3,9 +3,11 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.ValueArgument
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUNamedExpression private constructor(
     override val name: String?,
     override val sourcePsi: PsiElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
index e9ad511e9929..bd5104755bda 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt
@@ -4,13 +4,14 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.psi.KtObjectLiteralExpression
 import org.jetbrains.kotlin.psi.KtSuperTypeCallEntry
 import org.jetbrains.uast.*
-import org.jetbrains.uast.kotlin.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUObjectLiteralExpression(
     override val sourcePsi: KtObjectLiteralExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUParenthesizedExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUParenthesizedExpression.kt
index c5a825a6571e..d17112db0381 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUParenthesizedExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUParenthesizedExpression.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtParenthesizedExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UParenthesizedExpression
 
+@ApiStatus.Internal
 class KotlinUParenthesizedExpression(
     override val sourcePsi: KtParenthesizedExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
index 01d35a6ff8a0..7a87b27ce290 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt
@@ -3,11 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiMethod
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtPostfixExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUPostfixExpression(
     override val sourcePsi: KtPostfixExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
index 6653326daea2..42bef8b8d4fd 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiMethod
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtPrefixExpression
 import org.jetbrains.uast.UElement
@@ -10,6 +11,7 @@ import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.UPrefixExpression
 import org.jetbrains.uast.UastPrefixOperator
 
+@ApiStatus.Internal
 class KotlinUPrefixExpression(
     override val sourcePsi: KtPrefixExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
index 3792dcd29ef0..726ec2b29520 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt
@@ -4,10 +4,12 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUQualifiedReferenceExpression(
     override val sourcePsi: KtDotQualifiedExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUReturnExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUReturnExpression.kt
index 83789bbf51b6..9b4ebbaf8858 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUReturnExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUReturnExpression.kt
@@ -2,9 +2,11 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtReturnExpression
 import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 class KotlinUReturnExpression(
     override val sourcePsi: KtReturnExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
index b3a6e67c2bd3..c10335d62be5 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt
@@ -5,12 +5,14 @@ package org.jetbrains.uast.kotlin
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import com.intellij.psi.ResolveResult
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtSafeQualifiedExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UMultiResolvable
 import org.jetbrains.uast.UQualifiedReferenceExpression
 import org.jetbrains.uast.kotlin.internal.getResolveResultVariants
 
+@ApiStatus.Internal
 class KotlinUSafeQualifiedExpression(
     override val sourcePsi: KtSafeQualifiedExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
index 0fc76ff68940..da6c189c5513 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt
@@ -7,7 +7,7 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.openapi.util.Key
 import com.intellij.psi.*
-import org.jetbrains.kotlin.idea.references.readWriteAccess
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.findAssignment
 import org.jetbrains.uast.*
@@ -17,6 +17,7 @@ import org.jetbrains.uast.visitor.UastVisitor
 
 var PsiElement.destructuringDeclarationInitializer: Boolean? by UserDataProperty(Key.create("kotlin.uast.destructuringDeclarationInitializer"))
 
+@ApiStatus.Internal
 class KotlinUSimpleReferenceExpression(
     override val sourcePsi: KtSimpleNameExpression,
     givenParent: UElement?
@@ -49,7 +50,7 @@ class KotlinUSimpleReferenceExpression(
     private fun visitAccessorCalls(visitor: UastVisitor) {
         // Visit Kotlin get-set synthetic Java property calls as function calls
         val resolvedMethod = baseResolveProviderService.resolveAccessorCall(sourcePsi) ?: return
-        val access = sourcePsi.readWriteAccess(useResolveForReadWrite = false)
+        val access = sourcePsi.readWriteAccess()
         val setterValue = if (access.isWrite) {
             findAssignment(sourcePsi)?.right ?: run {
                 visitor.afterVisitSimpleNameReferenceExpression(this)
@@ -68,6 +69,7 @@ class KotlinUSimpleReferenceExpression(
         }
     }
 
+    @ApiStatus.Internal
     class KotlinAccessorCallExpression(
         override val sourcePsi: KtSimpleNameExpression,
         givenParent: KotlinUSimpleReferenceExpression,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt
index 011ab457f9fb..d235b9d2293f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtSuperExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.USuperExpression
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUSuperExpression(
     override val sourcePsi: KtSuperExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt
index e4e5b91921cd..29561aa0a130 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtThisExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UIdentifier
 import org.jetbrains.uast.UThisExpression
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUThisExpression(
     override val sourcePsi: KtThisExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThrowExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThrowExpression.kt
index a3c350102afa..cde8ae2fb5d2 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThrowExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThrowExpression.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtThrowExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UThrowExpression
 
+@ApiStatus.Internal
 class KotlinUThrowExpression(
     override val sourcePsi: KtThrowExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt
index 16af8bb80d55..9ceb289cebca 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtIsExpression
 import org.jetbrains.uast.UBinaryExpressionWithType
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UastBinaryExpressionWithTypeKind
 import org.jetbrains.uast.UastErrorType
 
+@ApiStatus.Internal
 class KotlinUTypeCheckExpression(
     override val sourcePsi: KtIsExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeReferenceExpression.kt
index 85ed54e0ba7b..2d85c49def49 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeReferenceExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeReferenceExpression.kt
@@ -3,11 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtTypeReference
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UTypeReferenceExpression
 import org.jetbrains.uast.UastErrorType
 
+@ApiStatus.Internal
 class KotlinUTypeReferenceExpression(
     override val sourcePsi: KtTypeReference?,
     givenParent: UElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt
index 804506514c29..3c4514cdad23 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt
@@ -4,10 +4,12 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiType
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.ValueArgument
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve
 
+@ApiStatus.Internal
 class KotlinUVarargExpression(
     private val valueArgs: List<ValueArgument>,
     uastParent: UElement?,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/UnknownKotlinExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/UnknownKotlinExpression.kt
index afe77c7ca448..7beb9f623230 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/UnknownKotlinExpression.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/UnknownKotlinExpression.kt
@@ -2,10 +2,12 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 
+@ApiStatus.Internal
 class UnknownKotlinExpression(
     override val sourcePsi: KtExpression,
     givenParent: UElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/DelegatedMultiResolve.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/DelegatedMultiResolve.kt
index cb61b7fffdc1..ef689aff6332 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/DelegatedMultiResolve.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/DelegatedMultiResolve.kt
@@ -5,9 +5,11 @@ package org.jetbrains.uast.kotlin.internal
 import com.intellij.psi.PsiSubstitutor
 import com.intellij.psi.ResolveResult
 import com.intellij.psi.infos.CandidateInfo
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UMultiResolvable
 import org.jetbrains.uast.UResolvable
 
+@ApiStatus.Internal
 interface DelegatedMultiResolve : UMultiResolvable, UResolvable {
     override fun multiResolve(): Iterable<ResolveResult> = listOfNotNull(resolve()?.let { CandidateInfo(it, PsiSubstitutor.EMPTY) })
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinFakeUElement.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinFakeUElement.kt
index af6cfc81d63c..7e3f8debd824 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinFakeUElement.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinFakeUElement.kt
@@ -3,7 +3,9 @@
 package org.jetbrains.uast.kotlin.internal
 
 import com.intellij.psi.PsiElement
+import org.jetbrains.annotations.ApiStatus
 
+@ApiStatus.Internal
 interface KotlinFakeUElement {
     fun unwrapToSourcePsi(): List<PsiElement>
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinUElementWithComments.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinUElementWithComments.kt
index ce8f6e91c8c4..9940568dfc27 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinUElementWithComments.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/KotlinUElementWithComments.kt
@@ -5,19 +5,41 @@ package org.jetbrains.uast.kotlin.internal
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiWhiteSpace
+import org.jetbrains.annotations.ApiStatus
+import org.jetbrains.kotlin.psi.KtProperty
+import org.jetbrains.kotlin.psi.KtPropertyAccessor
 import org.jetbrains.kotlin.psi.KtValueArgument
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
-import org.jetbrains.uast.UComment
-import org.jetbrains.uast.UElement
-import org.jetbrains.uast.UExpression
-import org.jetbrains.uast.UParameter
+import org.jetbrains.uast.*
 
+@ApiStatus.Internal
 interface KotlinUElementWithComments : UElement {
 
     override val comments: List<UComment>
         get() {
             val psi = sourcePsi ?: return emptyList()
-            val childrenComments = psi.allChildren.filterIsInstance<PsiComment>().map { UComment(it, this) }.toList()
+            val childrenComments = commentsOnPsiElement(psi)
+            // Default property accessors
+            if (this is UMethod && psi is KtProperty) {
+                // Don't regard property's comments as accessor's comments,
+                // unless that property won't be materialized (e.g., property in interface)
+                val backingField = (uastParent as? UClass)?.fields?.find { it.sourcePsi == psi }
+                return if (backingField != null)
+                    emptyList()
+                else
+                    childrenComments
+            }
+            // Property accessor w/o its own comments
+            if (psi is KtPropertyAccessor && childrenComments.isEmpty()) {
+                // If the containing property does not have a backing field,
+                // comments on the property won't appear on any elements, so we should keep them here.
+                val propertyPsi = psi.parent as? KtProperty ?: return childrenComments
+                val backingField = (uastParent as? UClass)?.fields?.find { it.sourcePsi == propertyPsi }
+                return if (backingField != null)
+                    childrenComments
+                else
+                    commentsOnPsiElement(propertyPsi)
+            } // Property accessor w/ its own comments fall through and return those comments.
             if (this !is UExpression &&
                 this !is UParameter     // fun (/* prior */ a: Int) <-- /* prior */ is on the level of VALUE_PARAM_LIST
             )
@@ -32,6 +54,10 @@ interface KotlinUElementWithComments : UElement {
                     parent.nearestCommentSibling(forward = false)?.let { listOf(UComment(it, this)) }.orEmpty()
         }
 
+    private fun commentsOnPsiElement(psi: PsiElement): List<UComment> {
+        return psi.allChildren.filterIsInstance<PsiComment>().map { UComment(it, this) }.toList()
+    }
+
     private fun PsiElement.nearestCommentSibling(forward: Boolean): PsiComment? {
         var sibling = if (forward) nextSibling else prevSibling
         while (sibling is PsiWhiteSpace && !sibling.text.contains('\n')) {
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/baseKotlinInternalUastUtils.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/baseKotlinInternalUastUtils.kt
index 34c0563b2e6c..c4e1ce667639 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/baseKotlinInternalUastUtils.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/baseKotlinInternalUastUtils.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.uast.kotlin
 
+import com.intellij.lang.Language
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiTypesUtil
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
@@ -12,13 +13,14 @@ import org.jetbrains.kotlin.asJava.findFacadeClass
 import org.jetbrains.kotlin.asJava.getAccessorLightMethods
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.asJava.toLightElements
-import org.jetbrains.kotlin.idea.references.readWriteAccess
+import org.jetbrains.kotlin.idea.KotlinLanguage
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
-import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
-import org.jetbrains.kotlin.psi.psiUtil.parents
+import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.resolve.ArrayFqNames
+import org.jetbrains.kotlin.resolve.references.ReferenceAccess
+import org.jetbrains.kotlin.utils.addToStdlib.constant
 import org.jetbrains.uast.*
 
 @Suppress("NOTHING_TO_INLINE")
@@ -35,7 +37,7 @@ inline fun <reified T : UDeclaration, reified P : PsiElement> unwrap(element: P)
 
 fun unwrapFakeFileForLightClass(file: PsiFile): PsiFile = (file as? FakeFileForLightClass)?.ktFile ?: file
 
-internal fun getContainingLightClass(original: KtDeclaration): KtLightClass? =
+fun getContainingLightClass(original: KtDeclaration): KtLightClass? =
     (original.containingClassOrObject?.toLightClass() ?: original.containingKtFile.findFacadeClass())
 
 fun getKotlinMemberOrigin(element: PsiElement?): KtDeclaration? {
@@ -53,6 +55,30 @@ fun KtExpression.unwrapBlockOrParenthesis(): KtExpression {
     return innerExpression
 }
 
+fun KtExpression.readWriteAccess(): ReferenceAccess {
+    var expression = getQualifiedExpressionForSelectorOrThis()
+    loop@ while (true) {
+        val parent = expression.parent
+        when (parent) {
+            is KtParenthesizedExpression, is KtAnnotatedExpression, is KtLabeledExpression -> expression = parent as KtExpression
+            else -> break@loop
+        }
+    }
+
+    val assignment = expression.getAssignmentByLHS()
+    if (assignment != null) {
+        return when (assignment.operationToken) {
+            KtTokens.EQ -> ReferenceAccess.WRITE
+            else -> ReferenceAccess.READ_WRITE
+        }
+    }
+
+    return if ((expression.parent as? KtUnaryExpression)?.operationToken in constant { setOf(KtTokens.PLUSPLUS, KtTokens.MINUSMINUS) })
+        ReferenceAccess.READ_WRITE
+    else
+        ReferenceAccess.READ
+}
+
 fun KtElement.canAnalyze(): Boolean {
     if (!isValid) return false
     val containingFile = containingFile as? KtFile ?: return false // EA-114080, EA-113475, EA-134193
@@ -68,16 +94,13 @@ val KtTypeReference.nameElement: PsiElement?
         (it as? KtUserType)?.referenceExpression?.getReferencedNameElement() ?: it.navigationElement
     }
 
-fun KtClassOrObject.toPsiType(): PsiType {
+internal fun KtClassOrObject.toPsiType(): PsiType {
     val lightClass = toLightClass() ?: return UastErrorType
-    return if (lightClass is PsiAnonymousClass)
-        lightClass.baseClassType
-    else
-        PsiTypesUtil.getClassType(lightClass)
+    return PsiTypesUtil.getClassType(lightClass)
 }
 
 fun PsiElement.getMaybeLightElement(sourcePsi: KtExpression? = null): PsiElement? {
-    if (this is KtProperty && sourcePsi?.readWriteAccess(useResolveForReadWrite = false)?.isWrite == true) {
+    if (this is KtProperty && sourcePsi?.readWriteAccess()?.isWrite == true) {
         with(getAccessorLightMethods()) {
             (setter ?: backingField)?.let { return it } // backingField is for val property assignments in init blocks
         }
@@ -137,3 +160,13 @@ val KtElement.typeOwnerKind: TypeOwnerKind
         is KtExpression -> TypeOwnerKind.EXPRESSION
         else -> TypeOwnerKind.UNKNOWN
     }
+
+/** Returns true if the given element is written in Kotlin. */
+fun isKotlin(element: PsiElement?): Boolean {
+    return element != null && isKotlin(element.language)
+}
+
+/** Returns true if the given language is Kotlin. */
+fun isKotlin(language: Language?): Boolean {
+    return language == KotlinLanguage.INSTANCE
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt
index a9642f0b05c4..65c23a26c034 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt
@@ -2,12 +2,14 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UastBinaryExpressionWithTypeKind
 
+@ApiStatus.Internal
 object KotlinBinaryExpressionWithTypeKinds {
     @JvmField
     val NEGATED_INSTANCE_CHECK = UastBinaryExpressionWithTypeKind.InstanceCheck("!is")
 
     @JvmField
     val SAFE_TYPE_CAST = UastBinaryExpressionWithTypeKind.TypeCast("as?")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt
index 57f53757ef8c..6061f76cb7b9 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt
@@ -2,8 +2,10 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UastBinaryOperator
 
+@ApiStatus.Internal
 object KotlinBinaryOperators {
     @JvmField
     val IN = UastBinaryOperator("in")
@@ -13,4 +15,4 @@ object KotlinBinaryOperators {
 
     @JvmField
     val RANGE_TO = UastBinaryOperator("..")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt
index 7c3361d9829d..87cc7e6fe6a3 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt
@@ -2,9 +2,11 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UastPostfixOperator
 
+@ApiStatus.Internal
 object KotlinPostfixOperators {
     @JvmField
     val EXCLEXCL = UastPostfixOperator("!!")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt
index 562476ea4214..b1826641242f 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt
@@ -2,9 +2,11 @@
 
 package org.jetbrains.uast.kotlin
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UastQualifiedExpressionAccessType
 
+@ApiStatus.Internal
 object KotlinQualifiedExpressionAccessTypes {
     @JvmField
     val SAFE = UastQualifiedExpressionAccessType("?.")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt
index 1bcaf0b89400..9ea4c4df704a 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt
@@ -2,8 +2,10 @@
 
 package org.jetbrains.uast.kotlin.kinds
 
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.uast.UastSpecialExpressionKind
 
+@ApiStatus.Internal
 object KotlinSpecialExpressionKinds {
     @JvmField
     val WHEN = UastSpecialExpressionKind("when")
@@ -19,4 +21,4 @@ object KotlinSpecialExpressionKinds {
 
     @JvmField
     val SUPER_DELEGATION = UastSpecialExpressionKind("super_delegation")
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kotlinConvertParentUtils.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kotlinConvertParentUtils.kt
index eaa86200530f..4bb81ad0e048 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kotlinConvertParentUtils.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kotlinConvertParentUtils.kt
@@ -21,7 +21,7 @@ import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter
 import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable
 
-fun convertParentImpl(
+internal fun convertParentImpl(
     service: BaseKotlinUastResolveProviderService,
     uElement: UElement
 ): UElement? {
@@ -122,7 +122,7 @@ fun convertParentImpl(
     return result
 }
 
-fun convertParentImpl(
+internal fun convertParentImpl(
     service: BaseKotlinUastResolveProviderService,
     element: UElement,
     parent: PsiElement?
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightMethod.kt
index 7491bdce0a96..d1bab0e898ca 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightMethod.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightMethod.kt
@@ -5,6 +5,7 @@ package org.jetbrains.uast.kotlin.psi
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.psi.*
 import com.intellij.psi.impl.light.*
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.KotlinLightTypeParameterBuilder
 import org.jetbrains.kotlin.asJava.elements.KotlinLightTypeParameterListBuilder
 import org.jetbrains.kotlin.asJava.elements.KtLightAnnotationForSourceEntry
@@ -16,6 +17,7 @@ import org.jetbrains.uast.UastErrorType
 import org.jetbrains.uast.kotlin.BaseKotlinUastResolveProviderService
 import org.jetbrains.uast.kotlin.lz
 
+@ApiStatus.Internal
 class UastFakeLightMethod(
     original: KtFunction,
     containingClass: PsiClass,
@@ -92,6 +94,7 @@ class UastFakeLightMethod(
     override fun getParameterList(): PsiParameterList = _parameterList
 }
 
+@ApiStatus.Internal
 class UastFakeLightPrimaryConstructor(
     original: KtClassOrObject,
     lightClass: PsiClass,
@@ -99,6 +102,7 @@ class UastFakeLightPrimaryConstructor(
     override fun isConstructor(): Boolean = true
 }
 
+@ApiStatus.Internal
 abstract class UastFakeLightMethodBase<T: KtDeclaration>(
     val original: T,
     containingClass: PsiClass,
@@ -167,6 +171,10 @@ abstract class UastFakeLightMethodBase<T: KtDeclaration>(
                 super.isDeprecated()
     }
 
+    override fun isConstructor(): Boolean {
+        return original is KtConstructor<*>
+    }
+
     override fun getReturnType(): PsiType? {
         return baseResolveProviderService.getType(original, this)
     }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameter.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameter.kt
index 1be69135dc71..a5c73afc99f5 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameter.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameter.kt
@@ -8,6 +8,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiType
 import com.intellij.psi.impl.light.LightParameter
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtExpression
@@ -18,6 +19,7 @@ import org.jetbrains.uast.UastErrorType
 import org.jetbrains.uast.getParentOfType
 import org.jetbrains.uast.kotlin.BaseKotlinUastResolveProviderService
 
+@ApiStatus.Internal
 class UastKotlinPsiParameter(
     name: String,
     type: PsiType,
@@ -52,6 +54,7 @@ class UastKotlinPsiParameter(
 
 }
 
+@ApiStatus.Internal
 open class UastKotlinPsiParameterBase<T : KtElement>(
     name: String,
     type: PsiType,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt
index d52555215da6..b1c2e414ee71 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt
@@ -4,6 +4,7 @@ package org.jetbrains.uast.kotlin.psi
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.psi.*
 import com.intellij.psi.impl.light.LightTypeElement
+import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.asJava.elements.LightVariableBuilder
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.psi.*
@@ -12,6 +13,7 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.*
 
+@ApiStatus.Internal
 class UastKotlinPsiVariable private constructor(
     manager: PsiManager,
     name: String,
diff --git a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastCommentLogTestBase.kt b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastCommentLogTestBase.kt
index 48c442ba5215..b36c70478dd6 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastCommentLogTestBase.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastCommentLogTestBase.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.uast.test.common.kotlin
 
+import com.intellij.psi.PsiNamedElement
 import org.jetbrains.kotlin.idea.test.KotlinTestUtils
 import org.jetbrains.uast.*
 import org.jetbrains.uast.test.common.kotlin.UastTestSuffix.TXT
@@ -54,11 +55,13 @@ interface UastCommentLogTestBase : UastPluginSelection, UastFileComparisonTestBa
                 }
             }
 
+            private val UElement.nameIfAvailable: String
+                get() = (javaPsi as? PsiNamedElement)?.name?.takeIf { it.isNotBlank() } ?: "<no name provided>"
 
             override fun visitElement(node: UElement): Boolean {
                 if (node is UDeclaration || node is UFile) {
                     printIndent()
-                    appendLine("${node::class.java.simpleName}(")
+                    appendLine("${node::class.java.simpleName}:${node.nameIfAvailable}(")
                     level++
                     if (node is KotlinUElementWithComments) renderComments(node.comments)
                 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiFixtureTestBase.kt b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiFixtureTestBase.kt
index 4ef4f54f83c6..a142741d10f8 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiFixtureTestBase.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiFixtureTestBase.kt
@@ -5,9 +5,12 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
 import junit.framework.TestCase
+import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUES
+import org.jetbrains.kotlin.builtins.StandardNames.ENUM_VALUE_OF
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase.assertContainsElements
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCaseBase.assertDoesntContain
+import org.jetbrains.kotlin.psi.KtConstructor
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.KotlinUFunctionCallExpression
@@ -344,6 +347,24 @@ interface UastResolveApiFixtureTestBase : UastPluginSelection {
         TestCase.assertEquals("bar", resolved.name)
     }
 
+    fun checkResolveLocalDefaultConstructor(myFixture: JavaCodeInsightTestFixture) {
+        myFixture.configureByText(
+            "MyClass.kt", """
+            fun foo() {
+                class LocalClass
+
+                val lc = Local<caret>Class()
+            }
+        """
+        )
+
+        val uCallExpression = myFixture.file.findElementAt(myFixture.caretOffset).toUElement().getUCallExpression()
+            .orFail("cant convert to UCallExpression")
+        val resolved = uCallExpression.resolve()
+            .orFail("cant resolve from $uCallExpression")
+        TestCase.assertTrue("Not resolved to local class default constructor", resolved.isConstructor)
+        TestCase.assertEquals("LocalClass", resolved.name)
+    }
 
     fun checkResolveCompiledAnnotation(myFixture: JavaCodeInsightTestFixture) {
         myFixture.configureByText(
@@ -359,6 +380,27 @@ interface UastResolveApiFixtureTestBase : UastPluginSelection {
         TestCase.assertEquals("message", resolved.name)
     }
 
+    fun checkResolveSyntheticMethod(myFixture: JavaCodeInsightTestFixture) {
+        myFixture.configureByText(
+            "MyClass.kt", """
+            class Foo {
+                @JvmSynthetic
+                fun bar() {}
+            }
+
+            fun test() {
+                Foo().ba<caret>r()
+            }
+        """
+        )
+
+        val uCallExpression = myFixture.file.findElementAt(myFixture.caretOffset).toUElement().getUCallExpression()
+            .orFail("cant convert to UCallExpression")
+        val resolved = uCallExpression.resolve()
+            .orFail("cant resolve from $uCallExpression")
+        TestCase.assertEquals("bar", resolved.name)
+    }
+
     fun checkAssigningArrayElementType(myFixture: JavaCodeInsightTestFixture) {
         myFixture.configureByText(
             "MyClass.kt", """ 
@@ -405,6 +447,11 @@ interface UastResolveApiFixtureTestBase : UastPluginSelection {
             fun test1() { }
             @Deprecated(level = DeprecationLevel.HIDDEN, message="no longer supported")
             fun test2() { }
+            
+            class Test(private val parameter: Int)  {
+                @Deprecated(message = "Binary compatibility", level = DeprecationLevel.HIDDEN)
+                constructor() : this(42)
+            }
         """
         )
 
@@ -421,6 +468,85 @@ interface UastResolveApiFixtureTestBase : UastPluginSelection {
         TestCase.assertTrue("Hidden level, hasAnnotation", test2.javaPsi.hasAnnotation("kotlin.Deprecated"))
         TestCase.assertTrue("Hidden level, isDeprecated", test2.javaPsi.isDeprecated)
         TestCase.assertTrue("Hidden level, public", test2.javaPsi.hasModifierProperty(PsiModifier.PUBLIC))
+
+        val testClass = uFile.findElementByTextFromPsi<UClass>("Test", strict = false)
+        TestCase.assertNotNull("can't convert class Test", testClass)
+        testClass.methods.forEach { mtd ->
+            if (mtd.sourcePsi is KtConstructor<*>) {
+                TestCase.assertTrue("$mtd should be marked as a constructor", mtd.isConstructor)
+            }
+        }
+    }
+
+    fun checkSyntheticEnumMethods(myFixture: JavaCodeInsightTestFixture) {
+        myFixture.configureByText(
+            "MyClass.kt", """
+            enum class MyEnum  {
+                FOO,
+                BAR;
+            }
+            
+            fun testValueOf() {
+              MyEnum.valueOf("FOO")
+            }
+            
+            fun testValues() {
+              MyEnum.values()
+            }
+        """
+        )
+
+        val uFile = myFixture.file.toUElement()!!
+        val myEnum = uFile.findElementByTextFromPsi<UClass>("MyEnum", strict = false)
+        TestCase.assertNotNull("can't convert enum class MyEnum", myEnum)
+
+        val syntheticMethods = setOf(ENUM_VALUES.identifier, ENUM_VALUE_OF.identifier)
+        var metValues = false
+        var metValueOf = false
+        myEnum.methods.forEach { mtd ->
+            if (!mtd.isConstructor) {
+                TestCase.assertNotNull("Null return type of $mtd", mtd.returnType)
+            }
+            if (mtd.name in syntheticMethods) {
+                when (mtd.name) {
+                    ENUM_VALUES.identifier -> metValues = true
+                    ENUM_VALUE_OF.identifier -> metValueOf = true
+                }
+                TestCase.assertTrue(
+                    "Missing nullness annotations on $mtd",
+                    mtd.javaPsi.modifierList.annotations.any { it.isNullnessAnnotation }
+                )
+            }
+        }
+        TestCase.assertTrue("Expect to meet synthetic values() methods in an enum class", metValues)
+        TestCase.assertTrue("Expect to meet synthetic valueOf(String) methods in an enum class", metValueOf)
+
+        val testValueOf = uFile.findElementByTextFromPsi<UMethod>("testValueOf", strict = false)
+        TestCase.assertNotNull("testValueOf should be successfully converted", testValueOf)
+        val valueOfCall = testValueOf.findElementByText<UElement>("valueOf").uastParent as KotlinUFunctionCallExpression
+        val resolvedValueOfCall = valueOfCall.resolve()
+        TestCase.assertNotNull("Unresolved MyEnum.valueOf(String)", resolvedValueOfCall)
+        TestCase.assertNotNull("Null return type of $resolvedValueOfCall", resolvedValueOfCall?.returnType)
+        TestCase.assertTrue(
+            "Missing nullness annotations on $resolvedValueOfCall",
+            resolvedValueOfCall!!.annotations.any { it.isNullnessAnnotation }
+        )
+
+        val testValues = uFile.findElementByTextFromPsi<UMethod>("testValues", strict = false)
+        TestCase.assertNotNull("testValues should be successfully converted", testValues)
+        val valuesCall = testValues.findElementByText<UElement>("values").uastParent as KotlinUFunctionCallExpression
+        val resolvedValuesCall = valuesCall.resolve()
+        TestCase.assertNotNull("Unresolved MyEnum.values()", resolvedValuesCall)
+        TestCase.assertNotNull("Null return type of $resolvedValuesCall", resolvedValuesCall?.returnType)
+        TestCase.assertTrue(
+            "Missing nullness annotations on $resolvedValuesCall",
+            resolvedValuesCall!!.annotations.any { it.isNullnessAnnotation }
+        )
     }
 
+    private val PsiAnnotation.isNullnessAnnotation: Boolean
+        get() {
+            return qualifiedName?.endsWith("NotNull") == true || qualifiedName?.endsWith("Nullable") == true
+        }
+
 }
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiTestBase.kt b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiTestBase.kt
index 3245418f400c..76f23c465017 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiTestBase.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveApiTestBase.kt
@@ -197,4 +197,13 @@ interface UastResolveApiTestBase : UastPluginSelection {
             checkRetentionAndResolve(rebuiltAnnotation)
         }
     }
+
+    fun checkThreadSafe(uFilePath: String, uFile: UFile) {
+        val safeClass = uFile.classes.find { it.name == "SafeClass" }
+            ?: throw IllegalStateException("Target class not found at ${uFile.asRefNames()}")
+        val k_delegate = safeClass.fields.find { it.name == "k\$delegate" }
+            ?: throw IllegalStateException("Target field not found at ${safeClass.name}")
+        // Without retrieving delegate expression type, it would be just "Lazy" (w/o type argument).
+        TestCase.assertEquals("PsiType:Lazy<? extends SimpleSafeClass>", k_delegate.type.toString())
+    }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveEverythingTestBase.kt b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveEverythingTestBase.kt
index 53a772904c50..93c695b45d3c 100644
--- a/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveEverythingTestBase.kt
+++ b/plugins/kotlin/uast/uast-kotlin-base/test/org/jetbrains/uast/test/common/kotlin/UastResolveEverythingTestBase.kt
@@ -4,7 +4,10 @@
  */
 package org.jetbrains.uast.test.common.kotlin
 
+import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiField
+import com.intellij.psi.PsiMethod
 import com.intellij.psi.impl.light.LightMethodBuilder
 import com.intellij.psi.impl.light.LightParameter
 import com.intellij.psi.impl.light.LightTypeParameterBuilder
@@ -51,14 +54,20 @@ interface UastResolveEverythingTestBase : UastPluginSelection, UastFileCompariso
     companion object {
         private val PsiElement?.needsDifferentRender: Boolean
             get() = this is KtLightElement<*, *> ||
+                    this is PsiClass ||
+                    this is PsiMethod ||
+                    this is PsiField ||
                     this is LightMethodBuilder ||
                     this is LightVariableBuilder ||
                     this is LightParameter ||
                     this is LightTypeParameterBuilder
 
         private const val TAG_CLASS = "Kotlin_Light_Class"
+        private const val TAG_CLASS_DECOMPILED = "Decompiled_Class"
         private const val TAG_METHOD = "Kotlin_Light_Method"
+        private const val TAG_METHOD_DECOMPILED = "Decompiled_Method"
         private const val TAG_VARIABLE = "Kotlin_Light_Variable"
+        private const val TAG_VARIABLE_DECOMPILED = "Decompiled_Variable"
         private const val TAG_VALUE_PARAMETER = "Kotlin_Light_Value_Parameter"
         private const val TAG_TYPE_PARAMETER = "Kotlin_Light_Type_Parameter"
 
@@ -74,18 +83,34 @@ interface UastResolveEverythingTestBase : UastPluginSelection, UastFileCompariso
         private val REGEXES: Map<Regex, String> = mapOf(
             Regex("^FirLight.*Class.*Symbol:") to "$TAG_CLASS:",
 
+            Regex("^PsiClass:.+$") to TAG_CLASS_DECOMPILED,
+
             Regex("^FirLightConstructorForSymbol:.+$") to TAG_METHOD,
             Regex("^FirLight.*Method.*Symbol:.+$") to TAG_METHOD,
+
             Regex("^KtUltraLightMethodForSourceDeclaration:.+$") to TAG_METHOD,
             Regex("^LightMethodBuilder:.+$") to TAG_METHOD,
 
+            Regex("^KtLightMethodForDecompiledDeclaration of .+:.+$") to TAG_METHOD_DECOMPILED,
+            Regex("^PsiMethod:.+$") to TAG_METHOD_DECOMPILED,
+
             Regex("^KtLightField:.+$") to TAG_VARIABLE,
             Regex("^LightVariableBuilder:.+$") to TAG_VARIABLE,
 
+            Regex("^KtLightFieldForDecompiledDeclaration of .+:.+$") to TAG_VARIABLE_DECOMPILED,
+            Regex("^KtLightEnumEntryForDecompiledDeclaration.+:.+$") to TAG_VARIABLE_DECOMPILED,
+            Regex("^PsiField:.+$") to TAG_VARIABLE_DECOMPILED,
+
             Regex("^Fir Light Parameter .+$") to TAG_VALUE_PARAMETER,
 
             Regex("^FirLightTypeParameter:.+$") to TAG_TYPE_PARAMETER,
             Regex("^Light PSI class: .+$") to TAG_TYPE_PARAMETER,
+
+            // NB: tags are recursively built, e.g., KtLightMethodForDecompiled... of KtLightClassForDecompiled... of ...
+            // Therefore, we should try regex patterns for member names before class names.
+            Regex("^KtLight.*ClassForDecompiled.+ of .+:.+$") to TAG_CLASS_DECOMPILED,
+            Regex("^KtLightClassForDecompiledFacade:.+$") to TAG_CLASS_DECOMPILED,
         )
+
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin-fir.iml b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin-fir.iml
index 53cd45ba3c6f..d25c7b94ee31 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin-fir.iml
+++ b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin-fir.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -51,4 +52,4 @@
     <orderEntry type="module" module-name="kotlin.fir.analysis-project-structure-ide-impl" scope="RUNTIME" />
     <orderEntry type="library" name="kotlinc.analysis-project-structure" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
index ceb179f110af..a7ed4128bbb6 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt
@@ -3,11 +3,14 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import com.intellij.psi.impl.compiled.ClsMemberImpl
+import com.intellij.psi.impl.file.PsiPackageImpl
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.analysis.api.KtTypeArgumentWithVariance
 import org.jetbrains.kotlin.analysis.api.analyseForUast
 import org.jetbrains.kotlin.analysis.api.base.KtConstantValue
 import org.jetbrains.kotlin.analysis.api.calls.*
+import org.jetbrains.kotlin.analysis.api.components.KtConstantEvaluationMode
 import org.jetbrains.kotlin.analysis.api.components.buildClassType
 import org.jetbrains.kotlin.analysis.api.components.buildTypeParameterType
 import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
@@ -16,8 +19,11 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtSamConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtValueParameterSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.analysis.api.types.*
+import org.jetbrains.kotlin.analysis.project.structure.KtLibraryModule
 import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
 import org.jetbrains.kotlin.analysis.project.structure.getKtModule
+import org.jetbrains.kotlin.asJava.toLightAnnotation
+import org.jetbrains.kotlin.asJava.toLightElements
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.psi.*
@@ -39,6 +45,10 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
     private val KtExpression.parentValueArgument: ValueArgument?
         get() = parents.firstOrNull { it is ValueArgument } as? ValueArgument
 
+    override fun convertToPsiAnnotation(ktElement: KtElement): PsiAnnotation? {
+        return ktElement.toLightAnnotation()
+    }
+
     override fun convertValueArguments(ktCallElement: KtCallElement, parent: UElement): List<UNamedExpression>? {
         analyseForUast(ktCallElement) {
             val argumentMapping = ktCallElement.resolveCall().singleFunctionCallOrNull()?.argumentMapping ?: return null
@@ -153,6 +163,10 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
         }
     }
 
+    override fun getPsiAnnotations(psiElement: PsiModifierListOwner): Array<PsiAnnotation> {
+        return psiElement.annotations
+    }
+
     override fun resolveBitwiseOperators(ktBinaryExpression: KtBinaryExpression): UastBinaryOperator {
         val other = UastBinaryOperator.OTHER
         analyseForUast(ktBinaryExpression) {
@@ -255,24 +269,42 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
     }
 
     override fun resolveToDeclaration(ktExpression: KtExpression): PsiElement? {
-        val resolvedTargetElement = when (ktExpression) {
+        val resolvedTargetSymbol = when (ktExpression) {
             is KtExpressionWithLabel -> {
                 analyseForUast(ktExpression) {
-                    ktExpression.getTargetLabel()?.mainReference?.resolve()
+                    ktExpression.getTargetLabel()?.mainReference?.resolveToSymbol()
                 }
             }
             is KtReferenceExpression -> {
                 analyseForUast(ktExpression) {
-                    ktExpression.mainReference.resolve()
+                    ktExpression.mainReference.resolveToSymbol()
                 }
             }
-            else ->
-                return null
+            else -> null
+        } ?: return null
+
+        val resolvedTargetElement = resolvedTargetSymbol.psi
+
+        // Shortcut: if the resolution target is compiled class/member, package info, or pure Java declarations,
+        //   we can return it early here (to avoid expensive follow-up steps: module retrieval and light element conversion).
+        if (resolvedTargetElement is ClsMemberImpl<*> ||
+            resolvedTargetElement is PsiPackageImpl ||
+            !isKotlin(resolvedTargetElement)
+        ) {
+            return resolvedTargetElement
         }
 
-        resolvedTargetElement?.takeIf {
-            it is KtDeclaration && it.getKtModule() is KtSourceModule
-        }?.getMaybeLightElement(ktExpression)?.let { return it }
+        val ktModule = (resolvedTargetElement as? KtDeclaration)?.getKtModule()
+        when (ktModule) {
+            is KtSourceModule -> {
+                // `getMaybeLightElement` tries light element conversion first, and then something else for local declarations.
+                resolvedTargetElement?.getMaybeLightElement(ktExpression)?.let { return it }
+            }
+            is KtLibraryModule -> {
+                // For decompiled declarations, we can try light element conversion (only).
+                (resolvedTargetElement as? KtDeclaration)?.toLightElements()?.singleOrNull()?.let { return it }
+            }
+        }
 
         fun resolveToPsiClassOrEnumEntry(classOrObject: KtClassOrObject): PsiElement? {
             analyseForUast(ktExpression) {
@@ -457,7 +489,8 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer
     override fun evaluate(uExpression: UExpression): Any? {
         val ktExpression = uExpression.sourcePsi as? KtExpression ?: return null
         analyseForUast(ktExpression) {
-            return ktExpression.evaluate()?.takeUnless { it is KtConstantValue.KtErrorConstantValue }?.value
+            return ktExpression.evaluate(KtConstantEvaluationMode.CONSTANT_LIKE_EXPRESSION_EVALUATION)
+                ?.takeUnless { it is KtConstantValue.KtErrorConstantValue }?.value
         }
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/internal/firKotlinInternalUastUtils.kt b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/internal/firKotlinInternalUastUtils.kt
index 7f69f5f5629c..de69d59c27fc 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/internal/firKotlinInternalUastUtils.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/internal/firKotlinInternalUastUtils.kt
@@ -7,24 +7,27 @@ import com.intellij.psi.util.PsiTypesUtil
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol
+import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.types.KtClassErrorType
 import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
 import org.jetbrains.kotlin.analysis.api.types.KtType
 import org.jetbrains.kotlin.analysis.api.types.KtTypeMappingMode
+import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
+import org.jetbrains.kotlin.analysis.project.structure.getKtModule
 import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.name.StandardClassIds
-import org.jetbrains.kotlin.psi.KtClass
-import org.jetbrains.kotlin.psi.KtConstructor
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClass
 import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.FirKotlinUastLanguagePlugin
 import org.jetbrains.uast.kotlin.TypeOwnerKind
+import org.jetbrains.uast.kotlin.getContainingLightClass
 import org.jetbrains.uast.kotlin.lz
+import org.jetbrains.uast.kotlin.psi.UastFakeLightMethod
+import org.jetbrains.uast.kotlin.psi.UastFakeLightPrimaryConstructor
 
 val firKotlinUastPlugin: FirKotlinUastLanguagePlugin by lz {
     UastLanguagePlugin.getInstances().single { it.language == KotlinLanguage.INSTANCE } as FirKotlinUastLanguagePlugin?
@@ -52,13 +55,36 @@ internal fun KtAnalysisSession.toPsiClass(
 }
 
 internal fun KtAnalysisSession.toPsiMethod(functionSymbol: KtFunctionLikeSymbol): PsiMethod? {
-    val psi = functionSymbol.psi ?: return null
-    try {
-        return psi.getRepresentativeLightMethod()
-    } catch (e: IllegalStateException) {
-        // TODO: Creating FirModuleResolveState is not yet supported for LibrarySourceInfo(libraryName=myLibrary)
-        //  this happens while destructuring a variable via Pair casting (testDestructuringDeclaration).
-        return null
+    return when (val psi = functionSymbol.psi) {
+        null -> null
+        is PsiMethod -> psi
+        is KtClassOrObject -> {
+            // For synthetic members in enum classes, `psi` points to their containing enum class.
+            if (psi is KtClass && psi.isEnum()) {
+                val lc = psi.toLightClass() ?: return null
+                lc.methods.find { it.name == (functionSymbol as? KtFunctionSymbol)?.name?.identifier }?.let { return it }
+            }
+
+            // Default primary constructor
+            psi.primaryConstructor?.getRepresentativeLightMethod()?.let { return it }
+            val lc = psi.toLightClass() ?: return null
+            lc.constructors.firstOrNull()?.let { return it }
+            if (psi.isLocal) UastFakeLightPrimaryConstructor(psi, lc) else null
+        }
+        is KtFunction -> {
+            // For JVM-invisible methods, such as @JvmSynthetic, LC conversion returns nothing, so fake it
+            fun handleLocalOrSynthetic(source: KtFunction): PsiMethod? {
+                val ktModule = source.getKtModule()
+                if (ktModule !is KtSourceModule) return null
+                return getContainingLightClass(source)?.let { UastFakeLightMethod(source, it) }
+            }
+
+            if (psi.isLocal)
+                handleLocalOrSynthetic(psi)
+            else
+                psi.getRepresentativeLightMethod() ?: handleLocalOrSynthetic(psi)
+        }
+        else -> psi.getRepresentativeLightMethod()
     }
 }
 
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
index 2d07a114f282..44982401d9f7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/AbstractFirLegacyUastIdentifiersTest.kt
@@ -12,12 +12,12 @@ abstract class AbstractFirLegacyUastIdentifiersTest : AbstractFirUastIdentifiers
     @OptIn(ExperimentalPathApi::class)
     private val whitelist : Set<String> = setOf(
         // TODO: Also failed with FE1.0 UAST
-        "uast-kotlin/testData/DestructuringDeclaration.kt",
-        "uast-kotlin/testData/LambdaReturn.kt",
-        "uast-kotlin/testData/WhenAndDestructing.kt",
+        "uast-kotlin/tests/testData/DestructuringDeclaration.kt",
+        "uast-kotlin/tests/testData/LambdaReturn.kt",
+        "uast-kotlin/tests/testData/WhenAndDestructing.kt",
 
         // TODO: this file fails 'testIdentifiersParents' check
-        "uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt",
+        "uast-kotlin/tests/testData/DataClassInheritsAbstractClassWithEquals.kt",
     ).mapTo(mutableSetOf()) { KotlinRoot.DIR_PATH.resolve("uast").resolve(it).absolute().normalize().toString() }
 
     override fun isExpectedToFail(filePath: String): Boolean {
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
index b9e0fa84ec32..bbcb46102db8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastDeclarationTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastDeclarationTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastDeclarationTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
index 9ebc5bebc6b5..807afcc4e0f9 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastIdentifiersTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastIdentifiersTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastIdentifiersTestGenerated extends AbstractFirLegacyUast
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
index 5f37194ad714..971de87f0d0f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastResolveEverythingTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -9,15 +9,15 @@ import org.jetbrains.kotlin.test.TestMetadata;
 import org.jetbrains.kotlin.idea.test.TestRoot;
 import org.junit.runner.RunWith;
 
-/*
- * This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}.
+/**
+ * This class is generated by {@link org.jetbrains.kotlin.testGenerator.generator.TestGenerator}.
  * DO NOT MODIFY MANUALLY.
  */
 @SuppressWarnings("all")
 @TestRoot("uast/uast-kotlin-fir")
 @TestDataPath("$CONTENT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
-@TestMetadata("../uast-kotlin/testData")
+@TestMetadata("../uast-kotlin/tests/testData")
 public class FirLegacyUastResolveEverythingTestGenerated extends AbstractFirLegacyUastResolveEverythingTest {
     private void runTest(String testDataFilePath) throws Exception {
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
@@ -25,376 +25,386 @@ public class FirLegacyUastResolveEverythingTestGenerated extends AbstractFirLega
 
     @TestMetadata("AnnotatedExpressions.kt")
     public void testAnnotatedExpressions() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotatedExpressions.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotatedExpressions.kt");
+    }
+
+    @TestMetadata("AnnotatedTypes.kt")
+    public void testAnnotatedTypes() throws Exception {
+        runTest("../uast-kotlin/tests/testData/AnnotatedTypes.kt");
     }
 
     @TestMetadata("AnnotationComplex.kt")
     public void testAnnotationComplex() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotationComplex.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotationComplex.kt");
     }
 
     @TestMetadata("AnnotationParameters.kt")
     public void testAnnotationParameters() throws Exception {
-        runTest("../uast-kotlin/testData/AnnotationParameters.kt");
+        runTest("../uast-kotlin/tests/testData/AnnotationParameters.kt");
     }
 
     @TestMetadata("Anonymous.kt")
     public void testAnonymous() throws Exception {
-        runTest("../uast-kotlin/testData/Anonymous.kt");
+        runTest("../uast-kotlin/tests/testData/Anonymous.kt");
     }
 
     @TestMetadata("Assertion.kt")
     public void testAssertion() throws Exception {
-        runTest("../uast-kotlin/testData/Assertion.kt");
+        runTest("../uast-kotlin/tests/testData/Assertion.kt");
     }
 
     @TestMetadata("Bitwise.kt")
     public void testBitwise() throws Exception {
-        runTest("../uast-kotlin/testData/Bitwise.kt");
+        runTest("../uast-kotlin/tests/testData/Bitwise.kt");
+    }
+
+    @TestMetadata("BrokenDataClass.kt")
+    public void testBrokenDataClass() throws Exception {
+        runTest("../uast-kotlin/tests/testData/BrokenDataClass.kt");
     }
 
     @TestMetadata("BrokenMethod.kt")
     public void testBrokenMethod() throws Exception {
-        runTest("../uast-kotlin/testData/BrokenMethod.kt");
+        runTest("../uast-kotlin/tests/testData/BrokenMethod.kt");
     }
 
     @TestMetadata("ClassAnnotation.kt")
     public void testClassAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/ClassAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/ClassAnnotation.kt");
     }
 
     @TestMetadata("CommentOwners.kt")
     public void testCommentOwners() throws Exception {
-        runTest("../uast-kotlin/testData/CommentOwners.kt");
+        runTest("../uast-kotlin/tests/testData/CommentOwners.kt");
     }
 
     @TestMetadata("Comments.kt")
     public void testComments() throws Exception {
-        runTest("../uast-kotlin/testData/Comments.kt");
+        runTest("../uast-kotlin/tests/testData/Comments.kt");
     }
 
     @TestMetadata("ConstructorDelegate.kt")
     public void testConstructorDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/ConstructorDelegate.kt");
+        runTest("../uast-kotlin/tests/testData/ConstructorDelegate.kt");
     }
 
     @TestMetadata("Constructors.kt")
     public void testConstructors() throws Exception {
-        runTest("../uast-kotlin/testData/Constructors.kt");
+        runTest("../uast-kotlin/tests/testData/Constructors.kt");
     }
 
     @TestMetadata("CycleInTypeParameters.kt")
     public void testCycleInTypeParameters() throws Exception {
-        runTest("../uast-kotlin/testData/CycleInTypeParameters.kt");
-    }
-
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
+        runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
-        runTest("../uast-kotlin/testData/DefaultImpls.kt");
+        runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
     }
 
     @TestMetadata("DefaultParameterValues.kt")
     public void testDefaultParameterValues() throws Exception {
-        runTest("../uast-kotlin/testData/DefaultParameterValues.kt");
+        runTest("../uast-kotlin/tests/testData/DefaultParameterValues.kt");
     }
 
     @TestMetadata("Delegate.kt")
     public void testDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/Delegate.kt");
+        runTest("../uast-kotlin/tests/testData/Delegate.kt");
     }
 
     @TestMetadata("DeprecatedHidden.kt")
     public void testDeprecatedHidden() throws Exception {
-        runTest("../uast-kotlin/testData/DeprecatedHidden.kt");
+        runTest("../uast-kotlin/tests/testData/DeprecatedHidden.kt");
     }
 
     @TestMetadata("DestructuringDeclaration.kt")
     public void testDestructuringDeclaration() throws Exception {
-        runTest("../uast-kotlin/testData/DestructuringDeclaration.kt");
+        runTest("../uast-kotlin/tests/testData/DestructuringDeclaration.kt");
     }
 
     @TestMetadata("ea101715.kt")
     public void testEa101715() throws Exception {
-        runTest("../uast-kotlin/testData/ea101715.kt");
+        runTest("../uast-kotlin/tests/testData/ea101715.kt");
     }
 
     @TestMetadata("Elvis.kt")
     public void testElvis() throws Exception {
-        runTest("../uast-kotlin/testData/Elvis.kt");
+        runTest("../uast-kotlin/tests/testData/Elvis.kt");
     }
 
     @TestMetadata("ElvisType.kt")
     public void testElvisType() throws Exception {
-        runTest("../uast-kotlin/testData/ElvisType.kt");
+        runTest("../uast-kotlin/tests/testData/ElvisType.kt");
     }
 
     @TestMetadata("EnumValueMembers.kt")
     public void testEnumValueMembers() throws Exception {
-        runTest("../uast-kotlin/testData/EnumValueMembers.kt");
+        runTest("../uast-kotlin/tests/testData/EnumValueMembers.kt");
     }
 
     @TestMetadata("EnumValuesConstructors.kt")
     public void testEnumValuesConstructors() throws Exception {
-        runTest("../uast-kotlin/testData/EnumValuesConstructors.kt");
+        runTest("../uast-kotlin/tests/testData/EnumValuesConstructors.kt");
     }
 
     @TestMetadata("IfStatement.kt")
     public void testIfStatement() throws Exception {
-        runTest("../uast-kotlin/testData/IfStatement.kt");
+        runTest("../uast-kotlin/tests/testData/IfStatement.kt");
     }
 
     @TestMetadata("Imports.kt")
     public void testImports() throws Exception {
-        runTest("../uast-kotlin/testData/Imports.kt");
+        runTest("../uast-kotlin/tests/testData/Imports.kt");
     }
 
     @TestMetadata("In.kt")
     public void testIn() throws Exception {
-        runTest("../uast-kotlin/testData/In.kt");
+        runTest("../uast-kotlin/tests/testData/In.kt");
     }
 
     @TestMetadata("InferenceInsideUnresolvedConstructor.kt")
     public void testInferenceInsideUnresolvedConstructor() throws Exception {
-        runTest("../uast-kotlin/testData/InferenceInsideUnresolvedConstructor.kt");
+        runTest("../uast-kotlin/tests/testData/InferenceInsideUnresolvedConstructor.kt");
     }
 
     @TestMetadata("InnerClasses.kt")
     public void testInnerClasses() throws Exception {
-        runTest("../uast-kotlin/testData/InnerClasses.kt");
+        runTest("../uast-kotlin/tests/testData/InnerClasses.kt");
     }
 
     @TestMetadata("InnerNonFixedTypeVariable.kt")
     public void testInnerNonFixedTypeVariable() throws Exception {
-        runTest("../uast-kotlin/testData/InnerNonFixedTypeVariable.kt");
+        runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
+    }
+
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
     }
 
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
-        runTest("../uast-kotlin/testData/LambdaParameters.kt");
+        runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
     }
 
     @TestMetadata("LambdaReturn.kt")
     public void testLambdaReturn() throws Exception {
-        runTest("../uast-kotlin/testData/LambdaReturn.kt");
+        runTest("../uast-kotlin/tests/testData/LambdaReturn.kt");
     }
 
     @TestMetadata("Lambdas.kt")
     public void testLambdas() throws Exception {
-        runTest("../uast-kotlin/testData/Lambdas.kt");
+        runTest("../uast-kotlin/tests/testData/Lambdas.kt");
     }
 
     @TestMetadata("LocalDeclarations.kt")
     public void testLocalDeclarations() throws Exception {
-        runTest("../uast-kotlin/testData/LocalDeclarations.kt");
+        runTest("../uast-kotlin/tests/testData/LocalDeclarations.kt");
     }
 
     @TestMetadata("LocalVariableWithAnnotation.kt")
     public void testLocalVariableWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/LocalVariableWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/LocalVariableWithAnnotation.kt");
     }
 
     @TestMetadata("ManyAlternatives.kt")
     public void testManyAlternatives() throws Exception {
-        runTest("../uast-kotlin/testData/ManyAlternatives.kt");
+        runTest("../uast-kotlin/tests/testData/ManyAlternatives.kt");
     }
 
     @TestMetadata("MethodReference.kt")
     public void testMethodReference() throws Exception {
-        runTest("../uast-kotlin/testData/MethodReference.kt");
+        runTest("../uast-kotlin/tests/testData/MethodReference.kt");
     }
 
     @TestMetadata("NameContainingFile.kt")
     public void testNameContainingFile() throws Exception {
-        runTest("../uast-kotlin/testData/NameContainingFile.kt");
+        runTest("../uast-kotlin/tests/testData/NameContainingFile.kt");
     }
 
     @TestMetadata("NonTrivialIdentifiers.kt")
     public void testNonTrivialIdentifiers() throws Exception {
-        runTest("../uast-kotlin/testData/NonTrivialIdentifiers.kt");
+        runTest("../uast-kotlin/tests/testData/NonTrivialIdentifiers.kt");
     }
 
     @TestMetadata("ParameterPropertyWithAnnotation.kt")
     public void testParameterPropertyWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/ParameterPropertyWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/ParameterPropertyWithAnnotation.kt");
     }
 
     @TestMetadata("ParametersDisorder.kt")
     public void testParametersDisorder() throws Exception {
-        runTest("../uast-kotlin/testData/ParametersDisorder.kt");
+        runTest("../uast-kotlin/tests/testData/ParametersDisorder.kt");
     }
 
     @TestMetadata("ParametersWithDefaultValues.kt")
     public void testParametersWithDefaultValues() throws Exception {
-        runTest("../uast-kotlin/testData/ParametersWithDefaultValues.kt");
+        runTest("../uast-kotlin/tests/testData/ParametersWithDefaultValues.kt");
     }
 
     @TestMetadata("PropertyAccessors.kt")
     public void testPropertyAccessors() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyAccessors.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyAccessors.kt");
     }
 
     @TestMetadata("PropertyDelegate.kt")
     public void testPropertyDelegate() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyDelegate.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyDelegate.kt");
     }
 
     @TestMetadata("PropertyInitializer.kt")
     public void testPropertyInitializer() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyInitializer.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyInitializer.kt");
     }
 
     @TestMetadata("PropertyInitializerWithoutSetter.kt")
     public void testPropertyInitializerWithoutSetter() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyInitializerWithoutSetter.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyInitializerWithoutSetter.kt");
     }
 
     @TestMetadata("PropertyReferences.kt")
     public void testPropertyReferences() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyReferences.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyReferences.kt");
     }
 
     @TestMetadata("PropertyWithAnnotation.kt")
     public void testPropertyWithAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/PropertyWithAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/PropertyWithAnnotation.kt");
     }
 
     @TestMetadata("QualifiedConstructorCall.kt")
     public void testQualifiedConstructorCall() throws Exception {
-        runTest("../uast-kotlin/testData/QualifiedConstructorCall.kt");
+        runTest("../uast-kotlin/tests/testData/QualifiedConstructorCall.kt");
     }
 
     @TestMetadata("ReceiverFun.kt")
     public void testReceiverFun() throws Exception {
-        runTest("../uast-kotlin/testData/ReceiverFun.kt");
+        runTest("../uast-kotlin/tests/testData/ReceiverFun.kt");
     }
 
     @TestMetadata("Reified.kt")
     public void testReified() throws Exception {
-        runTest("../uast-kotlin/testData/Reified.kt");
+        runTest("../uast-kotlin/tests/testData/Reified.kt");
     }
 
     @TestMetadata("ReifiedParameters.kt")
     public void testReifiedParameters() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedParameters.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedParameters.kt");
     }
 
     @TestMetadata("ReifiedResolve.kt")
     public void testReifiedResolve() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedResolve.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedResolve.kt");
     }
 
     @TestMetadata("ReifiedReturnType.kt")
     public void testReifiedReturnType() throws Exception {
-        runTest("../uast-kotlin/testData/ReifiedReturnType.kt");
+        runTest("../uast-kotlin/tests/testData/ReifiedReturnType.kt");
     }
 
     @TestMetadata("Resolve.kt")
     public void testResolve() throws Exception {
-        runTest("../uast-kotlin/testData/Resolve.kt");
+        runTest("../uast-kotlin/tests/testData/Resolve.kt");
     }
 
     @TestMetadata("SAM.kt")
     public void testSAM() throws Exception {
-        runTest("../uast-kotlin/testData/SAM.kt");
+        runTest("../uast-kotlin/tests/testData/SAM.kt");
     }
 
     @TestMetadata("Simple.kt")
     public void testSimple() throws Exception {
-        runTest("../uast-kotlin/testData/Simple.kt");
+        runTest("../uast-kotlin/tests/testData/Simple.kt");
     }
 
     @TestMetadata("SimpleAnnotated.kt")
     public void testSimpleAnnotated() throws Exception {
-        runTest("../uast-kotlin/testData/SimpleAnnotated.kt");
+        runTest("../uast-kotlin/tests/testData/SimpleAnnotated.kt");
     }
 
     @TestMetadata("StringTemplate.kt")
     public void testStringTemplate() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplate.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplate.kt");
     }
 
     @TestMetadata("StringTemplateComplex.kt")
     public void testStringTemplateComplex() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateComplex.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateComplex.kt");
     }
 
     @TestMetadata("StringTemplateComplexForUInjectionHost.kt")
     public void testStringTemplateComplexForUInjectionHost() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateComplexForUInjectionHost.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateComplexForUInjectionHost.kt");
     }
 
     @TestMetadata("StringTemplateInClass.kt")
     public void testStringTemplateInClass() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateInClass.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateInClass.kt");
     }
 
     @TestMetadata("StringTemplateWithVar.kt")
     public void testStringTemplateWithVar() throws Exception {
-        runTest("../uast-kotlin/testData/StringTemplateWithVar.kt");
+        runTest("../uast-kotlin/tests/testData/StringTemplateWithVar.kt");
     }
 
     @TestMetadata("SuperCalls.kt")
     public void testSuperCalls() throws Exception {
-        runTest("../uast-kotlin/testData/SuperCalls.kt");
+        runTest("../uast-kotlin/tests/testData/SuperCalls.kt");
     }
 
     @TestMetadata("Suspend.kt")
     public void testSuspend() throws Exception {
-        runTest("../uast-kotlin/testData/Suspend.kt");
+        runTest("../uast-kotlin/tests/testData/Suspend.kt");
     }
 
     @TestMetadata("TryCatch.kt")
     public void testTryCatch() throws Exception {
-        runTest("../uast-kotlin/testData/TryCatch.kt");
+        runTest("../uast-kotlin/tests/testData/TryCatch.kt");
     }
 
     @TestMetadata("TypeAliasConstructorReference.kt")
     public void testTypeAliasConstructorReference() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliasConstructorReference.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliasConstructorReference.kt");
     }
 
     @TestMetadata("TypeAliasExpansionWithOtherAliasInArgument.kt")
     public void testTypeAliasExpansionWithOtherAliasInArgument() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliasExpansionWithOtherAliasInArgument.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliasExpansionWithOtherAliasInArgument.kt");
     }
 
     @TestMetadata("TypeAliases.kt")
     public void testTypeAliases() throws Exception {
-        runTest("../uast-kotlin/testData/TypeAliases.kt");
+        runTest("../uast-kotlin/tests/testData/TypeAliases.kt");
     }
 
     @TestMetadata("TypeInAnnotation.kt")
     public void testTypeInAnnotation() throws Exception {
-        runTest("../uast-kotlin/testData/TypeInAnnotation.kt");
+        runTest("../uast-kotlin/tests/testData/TypeInAnnotation.kt");
     }
 
     @TestMetadata("TypeReferences.kt")
     public void testTypeReferences() throws Exception {
-        runTest("../uast-kotlin/testData/TypeReferences.kt");
+        runTest("../uast-kotlin/tests/testData/TypeReferences.kt");
     }
 
     @TestMetadata("UnexpectedContainerException.kt")
     public void testUnexpectedContainerException() throws Exception {
-        runTest("../uast-kotlin/testData/UnexpectedContainerException.kt");
+        runTest("../uast-kotlin/tests/testData/UnexpectedContainerException.kt");
     }
 
     @TestMetadata("WhenAndDestructing.kt")
     public void testWhenAndDestructing() throws Exception {
-        runTest("../uast-kotlin/testData/WhenAndDestructing.kt");
+        runTest("../uast-kotlin/tests/testData/WhenAndDestructing.kt");
     }
 
     @TestMetadata("WhenIs.kt")
     public void testWhenIs() throws Exception {
-        runTest("../uast-kotlin/testData/WhenIs.kt");
+        runTest("../uast-kotlin/tests/testData/WhenIs.kt");
     }
 
     @TestMetadata("WhenStringLiteral.kt")
     public void testWhenStringLiteral() throws Exception {
-        runTest("../uast-kotlin/testData/WhenStringLiteral.kt");
+        runTest("../uast-kotlin/tests/testData/WhenStringLiteral.kt");
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
index 8ad70c2ca87e..eacc2ec1c293 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastTypesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastTypesTestGenerated extends AbstractFirLegacyUastTypesT
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastTypesTestGenerated extends AbstractFirLegacyUastTypesT
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
index 25f5dabd3d65..e616c8185eb7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirLegacyUastValuesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -98,11 +98,6 @@ public class FirLegacyUastValuesTestGenerated extends AbstractFirLegacyUastValue
         runTest("../uast-kotlin/tests/testData/CycleInTypeParameters.kt");
     }
 
-    @TestMetadata("DataClassInheritsAbstractClassWithEquals.kt")
-    public void testDataClassInheritsAbstractClassWithEquals() throws Exception {
-        runTest("../uast-kotlin/testData/DataClassInheritsAbstractClassWithEquals.kt");
-    }
-
     @TestMetadata("DefaultImpls.kt")
     public void testDefaultImpls() throws Exception {
         runTest("../uast-kotlin/tests/testData/DefaultImpls.kt");
@@ -183,6 +178,11 @@ public class FirLegacyUastValuesTestGenerated extends AbstractFirLegacyUastValue
         runTest("../uast-kotlin/tests/testData/InnerNonFixedTypeVariable.kt");
     }
 
+    @TestMetadata("LambdaExpressionFunctionalInterfaceType.kt")
+    public void testLambdaExpressionFunctionalInterfaceType() throws Exception {
+        runTest("../uast-kotlin/tests/testData/LambdaExpressionFunctionalInterfaceType.kt");
+    }
+
     @TestMetadata("LambdaParameters.kt")
     public void testLambdaParameters() throws Exception {
         runTest("../uast-kotlin/tests/testData/LambdaParameters.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
index c42c3a51f8a3..1f2c64c7d809 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastApiTest.kt
@@ -26,12 +26,10 @@ open class FirUastApiTest : AbstractFirUastTest() {
     private val whitelist : Set<String> = setOf(
         // TODO: resolve to inline and stdlib
         "uast-kotlin/testData/Resolve.kt",
-        // TODO: resolve to local declarations/constructors
-        "uast-kotlin/testData/LocalDeclarations.kt",
         // TODO: return type of inline functions
-        "uast-kotlin/testData/ReifiedReturnType.kt",
+        "uast-kotlin/tests/testData/ReifiedReturnType.kt",
         // TODO: PsiMethod -> getFunctionalInterfaceMethod
-        "uast-kotlin/testData/LambdaParameters.kt",
+        "uast-kotlin/tests/testData/LambdaParameters.kt",
     )
 
     override fun isExpectedToFail(filePath: String, fileContent: String): Boolean {
@@ -54,7 +52,7 @@ open class FirUastApiTest : AbstractFirUastTest() {
         }
     }
 
-    @TestMetadata("../uast-kotlin/testData")
+    @TestMetadata("../uast-kotlin/tests/testData")
     @TestDataPath("\$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners::class)
     class Legacy : FirUastApiTest(), UastApiTestBase {
@@ -66,152 +64,152 @@ open class FirUastApiTest : AbstractFirUastTest() {
 
         @TestMetadata("AnnotationParameters.kt")
         fun testAnnotationParameters() {
-            doCheck("uast-kotlin/testData/AnnotationParameters.kt", ::checkCallbackForAnnotationParameters)
+            doCheck("uast-kotlin/tests/testData/AnnotationParameters.kt", ::checkCallbackForAnnotationParameters)
         }
 
         @TestMetadata("StringTemplateInClass.kt")
         fun testStringTemplateInClass() {
-            doCheck("uast-kotlin/testData/StringTemplateInClass.kt", ::checkCallbackForStringTemplateInClass)
+            doCheck("uast-kotlin/tests/testData/StringTemplateInClass.kt", ::checkCallbackForStringTemplateInClass)
         }
 
         @TestMetadata("StringTemplateWithVar.kt")
         fun testStringTemplateWithVar() {
-            doCheck("uast-kotlin/testData/StringTemplateWithVar.kt", ::checkCallbackForStringTemplateWithVar)
+            doCheck("uast-kotlin/tests/testData/StringTemplateWithVar.kt", ::checkCallbackForStringTemplateWithVar)
         }
 
         @TestMetadata("NameContainingFile.kt")
         fun testNameContainingFile() {
-            doCheck("uast-kotlin/testData/NameContainingFile.kt", ::checkCallbackForNameContainingFile)
+            doCheck("uast-kotlin/tests/testData/NameContainingFile.kt", ::checkCallbackForNameContainingFile)
         }
 
         @TestMetadata("DefaultImpls.kt")
         fun testDefaultImpls() {
-            doCheck("uast-kotlin/testData/DefaultImpls.kt", ::checkCallbackForDefaultImpls)
+            doCheck("uast-kotlin/tests/testData/DefaultImpls.kt", ::checkCallbackForDefaultImpls)
         }
 
         @TestMetadata("ParameterPropertyWithAnnotation.kt")
         fun testParameterPropertyWithAnnotation() {
-            doCheck("uast-kotlin/testData/ParameterPropertyWithAnnotation.kt", ::checkCallbackForParameterPropertyWithAnnotation)
+            doCheck("uast-kotlin/tests/testData/ParameterPropertyWithAnnotation.kt", ::checkCallbackForParameterPropertyWithAnnotation)
         }
 
         @TestMetadata("TypeInAnnotation.kt")
         fun testTypeInAnnotation() {
-            doCheck("uast-kotlin/testData/TypeInAnnotation.kt", ::checkCallbackForTypeInAnnotation)
+            doCheck("uast-kotlin/tests/testData/TypeInAnnotation.kt", ::checkCallbackForTypeInAnnotation)
         }
 
         @TestMetadata("ElvisType.kt")
         fun testElvisType() {
-            doCheck("uast-kotlin/testData/ElvisType.kt", ::checkCallbackForElvisType)
+            doCheck("uast-kotlin/tests/testData/ElvisType.kt", ::checkCallbackForElvisType)
         }
 
         @TestMetadata("IfStatement.kt")
         fun testIfStatement() {
-            doCheck("uast-kotlin/testData/IfStatement.kt", ::checkCallbackForIfStatement)
+            doCheck("uast-kotlin/tests/testData/IfStatement.kt", ::checkCallbackForIfStatement)
         }
 
         @TestMetadata("WhenStringLiteral.kt")
         fun testWhenStringLiteral() {
-            doCheck("uast-kotlin/testData/WhenStringLiteral.kt", ::checkCallbackForWhenStringLiteral)
+            doCheck("uast-kotlin/tests/testData/WhenStringLiteral.kt", ::checkCallbackForWhenStringLiteral)
         }
 
         @TestMetadata("WhenAndDestructing.kt")
         fun testWhenAndDestructing() {
-            doCheck("uast-kotlin/testData/WhenAndDestructing.kt", ::checkCallbackForWhenAndDestructing)
+            doCheck("uast-kotlin/tests/testData/WhenAndDestructing.kt", ::checkCallbackForWhenAndDestructing)
         }
 
         @TestMetadata("BrokenMethod.kt")
         fun testBrokenMethod() {
-            doCheck("uast-kotlin/testData/BrokenMethod.kt", ::checkCallbackForBrokenMethod)
+            doCheck("uast-kotlin/tests/testData/BrokenMethod.kt", ::checkCallbackForBrokenMethod)
         }
 
         @TestMetadata("EnumValuesConstructors.kt")
         fun testEnumValuesConstructors() {
-            doCheck("uast-kotlin/testData/EnumValuesConstructors.kt", ::checkCallbackForEnumValuesConstructors)
+            doCheck("uast-kotlin/tests/testData/EnumValuesConstructors.kt", ::checkCallbackForEnumValuesConstructors)
         }
 
         @TestMetadata("EnumValueMembers.kt")
         fun testEnumValueMembers() {
-            doCheck("uast-kotlin/testData/EnumValueMembers.kt", ::checkCallbackForEnumValueMembers)
+            doCheck("uast-kotlin/tests/testData/EnumValueMembers.kt", ::checkCallbackForEnumValueMembers)
         }
 
         @TestMetadata("SimpleAnnotated.kt")
         fun testSimpleAnnotated() {
-            doCheck("uast-kotlin/testData/SimpleAnnotated.kt", ::checkCallbackForSimpleAnnotated)
+            doCheck("uast-kotlin/tests/testData/SimpleAnnotated.kt", ::checkCallbackForSimpleAnnotated)
         }
 
         @TestMetadata("SuperCalls.kt")
         fun testSuperCalls() {
-            doCheck("uast-kotlin/testData/SuperCalls.kt", ::checkCallbackForSuperCalls)
+            doCheck("uast-kotlin/tests/testData/SuperCalls.kt", ::checkCallbackForSuperCalls)
         }
 
         @TestMetadata("Anonymous.kt")
         fun testAnonymous() {
-            doCheck("uast-kotlin/testData/Anonymous.kt", ::checkCallbackForAnonymous)
+            doCheck("uast-kotlin/tests/testData/Anonymous.kt", ::checkCallbackForAnonymous)
         }
 
         @TestMetadata("TypeAliases.kt")
         fun testTypeAliases() {
-            doCheck("uast-kotlin/testData/TypeAliases.kt", ::checkCallbackForTypeAliases)
+            doCheck("uast-kotlin/tests/testData/TypeAliases.kt", ::checkCallbackForTypeAliases)
         }
 
         @TestMetadata("AnnotationComplex.kt")
         fun testAnnotationComplex() {
-            doCheck("uast-kotlin/testData/AnnotationComplex.kt", ::checkCallbackForAnnotationComplex)
+            doCheck("uast-kotlin/tests/testData/AnnotationComplex.kt", ::checkCallbackForAnnotationComplex)
         }
 
         @TestMetadata("ParametersDisorder.kt")
         fun testParametersDisorder() {
-            doCheck("uast-kotlin/testData/ParametersDisorder.kt", ::checkCallbackForParametersDisorder)
+            doCheck("uast-kotlin/tests/testData/ParametersDisorder.kt", ::checkCallbackForParametersDisorder)
         }
 
         @TestMetadata("Resolve.kt")
         fun testResolve() {
-            doCheck("uast-kotlin/testData/Resolve.kt", ::checkCallbackForResolve)
+            doCheck("uast-kotlin/tests/testData/Resolve.kt", ::checkCallbackForResolve)
         }
 
         @TestMetadata("Lambdas.kt")
         fun testLambdas() {
-            doCheck("uast-kotlin/testData/Lambdas.kt", ::checkCallbackForLambdas)
+            doCheck("uast-kotlin/tests/testData/Lambdas.kt", ::checkCallbackForLambdas)
         }
 
         @TestMetadata("LocalDeclarations.kt")
         fun testLocalDeclarations() {
-            doCheck("uast-kotlin/testData/LocalDeclarations.kt", ::checkCallbackForLocalDeclarations)
+            doCheck("uast-kotlin/tests/testData/LocalDeclarations.kt", ::checkCallbackForLocalDeclarations)
         }
 
         @TestMetadata("Elvis.kt")
         fun testElvis() {
-            doCheck("uast-kotlin/testData/Elvis.kt", ::checkCallbackForElvis)
+            doCheck("uast-kotlin/tests/testData/Elvis.kt", ::checkCallbackForElvis)
         }
 
         @TestMetadata("TypeReferences.kt")
         fun testTypeReferences() {
-            doCheck("uast-kotlin/testData/TypeReferences.kt", ::checkCallbackForTypeReferences)
+            doCheck("uast-kotlin/tests/testData/TypeReferences.kt", ::checkCallbackForTypeReferences)
         }
 
         @TestMetadata("ReifiedReturnType.kt")
         fun testReifiedReturnType() {
-            doCheck("uast-kotlin/testData/ReifiedReturnType.kt", ::checkCallbackForReifiedReturnType)
+            doCheck("uast-kotlin/tests/testData/ReifiedReturnType.kt", ::checkCallbackForReifiedReturnType)
         }
 
         @TestMetadata("ReifiedParameters.kt")
         fun testReifiedParameters() {
-          doCheck("uast-kotlin/testData/ReifiedParameters.kt", ::checkCallbackForReifiedParameters)
+          doCheck("uast-kotlin/tests/testData/ReifiedParameters.kt", ::checkCallbackForReifiedParameters)
         }
 
         @TestMetadata("LambdaParameters.kt")
         fun testLambdaParameters() {
-            doCheck("uast-kotlin/testData/LambdaParameters.kt", ::checkCallbackForLambdaParameters)
+            doCheck("uast-kotlin/tests/testData/LambdaParameters.kt", ::checkCallbackForLambdaParameters)
         }
 
         @TestMetadata("SAM.kt")
         fun testSAM() {
-            doCheck("uast-kotlin/testData/SAM.kt", ::checkCallbackForSAM)
+            doCheck("uast-kotlin/tests/testData/SAM.kt", ::checkCallbackForSAM)
         }
 
         @TestMetadata("Simple.kt")
         fun testSimple() {
-            doCheck("uast-kotlin/testData/Simple.kt", ::checkCallbackForSimple)
+            doCheck("uast-kotlin/tests/testData/Simple.kt", ::checkCallbackForSimple)
         }
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
index 365e4532cbd8..77410b3f6bea 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastCommentsTest.java
@@ -18,6 +18,11 @@ public class FirUastCommentsTest extends AbstractFirUastCommentsTest {
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("facade.kt")
     public void testFacade() throws Exception {
         runTest("testData/declaration/facade.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
index d3b789696ada..5192824829ae 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastDeclarationTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -28,6 +28,11 @@ public class FirUastDeclarationTestGenerated extends AbstractFirUastDeclarationT
         runTest("testData/declaration/annotationOnElvis.kt");
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
         runTest("testData/declaration/doWhile.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
index 741fd133e2b7..84cbfa07354e 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiFixtureTest.kt
@@ -35,8 +35,6 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
         "MultiInvokableObjectResolve",
         // TODO: multiResolve
         "MultiResolveJvmOverloads",
-        // TODO: local resolution
-        "LocalResolve",
         // TODO: resolve annotation param to annotation ctor ??
         "ResolveCompiledAnnotation",
     )
@@ -111,10 +109,18 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
         doCheck("LocalResolve", ::checkLocalResolve)
     }
 
+    fun testResolveLocalDefaultConstructor() {
+        doCheck("ResolveLocalDefaultConstructor", ::checkResolveLocalDefaultConstructor)
+    }
+
     fun testResolveCompiledAnnotation() {
         doCheck("ResolveCompiledAnnotation", ::checkResolveCompiledAnnotation)
     }
 
+    fun testResolveSyntheticMethod() {
+        doCheck("ResolveSyntheticMethod", ::checkResolveSyntheticMethod)
+    }
+
     fun testAssigningArrayElementType() {
         doCheck("AssigningArrayElementType", ::checkAssigningArrayElementType)
     }
@@ -126,4 +132,8 @@ class FirUastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
     fun testDetailsOfDeprecatedHidden() {
         doCheck("DetailsOfDeprecatedHidden", ::checkDetailsOfDeprecatedHidden)
     }
+
+    fun testSyntheticEnumMethods() {
+        doCheck("SyntheticEnumMethods", ::checkSyntheticEnumMethods)
+    }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
index 1bc70ae60bf8..dfd5847f1bdf 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastResolveApiTest.kt
@@ -58,7 +58,23 @@ open class FirUastResolveApiTest : AbstractFirUastTest() {
         }
     }
 
-    @TestMetadata("../uast-kotlin/testData")
+    @TestMetadata("plugins/uast-kotlin-fir/testData/type")
+    @TestDataPath("\$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners::class)
+    class Type : FirUastResolveApiTest(), UastResolveApiTestBase {
+        override val isFirUastPlugin: Boolean = true
+
+        override fun check(filePath: String, file: UFile) {
+            // Bogus
+        }
+
+        @TestMetadata("threadSafe.kt")
+        fun testThreadSafe() {
+            doCheck("uast-kotlin-fir/testData/type/threadSafe.kt", ::checkThreadSafe)
+        }
+    }
+
+    @TestMetadata("../uast-kotlin/tests/testData")
     @TestDataPath("\$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners::class)
     class Legacy : FirUastResolveApiTest(), UastResolveApiTestBase {
@@ -70,16 +86,16 @@ open class FirUastResolveApiTest : AbstractFirUastTest() {
 
         @TestMetadata("MethodReference.kt")
         fun testMethodReference() {
-            doCheck("uast-kotlin/testData/MethodReference.kt", ::checkCallbackForMethodReference)
+            doCheck("uast-kotlin/tests/testData/MethodReference.kt", ::checkCallbackForMethodReference)
         }
 
         @TestMetadata("Imports.kt")
         fun testImports() {
-            doCheck("uast-kotlin/testData/Imports.kt", ::checkCallbackForImports)
+            doCheck("uast-kotlin/tests/testData/Imports.kt", ::checkCallbackForImports)
         }
 
         fun testReceiverFun() {
-            doCheck("uast-kotlin/testData/ReceiverFun.kt", ::checkCallbackForReceiverFun)
+            doCheck("uast-kotlin/tests/testData/ReceiverFun.kt", ::checkCallbackForReceiverFun)
         }
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
index 903995bf7b09..5dd3f48d46f8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin-fir/test/org/jetbrains/kotlin/idea/fir/uast/FirUastTypesTestGenerated.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package org.jetbrains.kotlin.idea.fir.uast;
 
@@ -43,6 +43,16 @@ public class FirUastTypesTestGenerated extends AbstractFirUastTypesTest {
         runTest("testData/type/classLiteral.kt");
     }
 
+    @TestMetadata("objectLiteral.kt")
+    public void testObjectLiteral() throws Exception {
+        runTest("testData/type/objectLiteral.kt");
+    }
+
+    @TestMetadata("threadSafe.kt")
+    public void testThreadSafe() throws Exception {
+        runTest("testData/type/threadSafe.kt");
+    }
+
     @TestMetadata("typeCast.kt")
     public void testTypeCast() throws Exception {
         runTest("testData/type/typeCast.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.comments.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.comments.txt
new file mode 100644
index 000000000000..5991a026e1b1
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.comments.txt
@@ -0,0 +1,58 @@
+KotlinUFile:commentsOnProperties.kt(
+    KotlinUClass:CommentsOnPropertiesKt(
+        KotlinUField:boo(
+            UComment(/**
+             * Multi-line document bound to property boo (w/ initializer)
+             */)
+        )
+        KotlinUField:bar(
+            UComment(/**
+             * Multi-line document bound to property bar (w/ backing field access)
+             */)
+        )
+        KotlinUField:baq(
+            UComment(// Single-line comment bound to property baq (w/ backing field access))
+        )
+        KotlinUMethod:getBoo(
+        )
+        KotlinUMethod:getBar(
+            UComment(// Single-line comment bound to getter for property bar)
+        )
+        KotlinUMethod:getBaq(
+        )
+        KotlinUMethod:getBaz(
+            UComment(/**
+             * Multi-line document bound to property baz (w/o backing field)
+             */)
+        )
+    )
+    KotlinUClass:Test(
+        KotlinUField:foo(
+            UComment(/**
+                 * Multi-line document bound to property foo (w/ initializer)
+                 */)
+        )
+        KotlinUField:far(
+            UComment(/**
+                 * Multi-line document bound to property far (w/ backing field access)
+                 */)
+        )
+        KotlinUField:faq(
+            UComment(// Single-line comment bound to property faq (w/ backing field access))
+        )
+        KotlinUMethod:getFoo(
+        )
+        KotlinUMethod:getFar(
+            UComment(// Single-line comment bound to getter for property bar)
+        )
+        KotlinUMethod:getFaq(
+        )
+        KotlinUMethod:getFaz(
+            UComment(/**
+                 * Multi-line document bound to property faz (w/o backing field)
+                 */)
+        )
+        KotlinConstructorUMethod:Test(
+        )
+    )
+)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.kt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.kt
new file mode 100644
index 000000000000..1926c0a0a603
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.kt
@@ -0,0 +1,43 @@
+/**
+ * Multi-line document bound to property boo (w/ initializer)
+ */
+val boo = 42
+
+/**
+ * Multi-line document bound to property bar (w/ backing field access)
+ */
+val bar = 42
+    // Single-line comment bound to getter for property bar
+    get() = field
+
+// Single-line comment bound to property baq (w/ backing field access)
+val baq = 42
+    get() = field
+
+/**
+ * Multi-line document bound to property baz (w/o backing field)
+ */
+val baz get() = 42
+
+class Test {
+    /**
+     * Multi-line document bound to property foo (w/ initializer)
+     */
+    val foo = 42
+
+    /**
+     * Multi-line document bound to property far (w/ backing field access)
+     */
+    val far = 42
+        // Single-line comment bound to getter for property bar
+        get() = field
+
+    // Single-line comment bound to property faq (w/ backing field access)
+    val faq = 42
+        get() = field
+
+    /**
+     * Multi-line document bound to property faz (w/o backing field)
+     */
+    val faz get() = 42
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.log.txt
new file mode 100644
index 000000000000..c156f0519c84
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.log.txt
@@ -0,0 +1,48 @@
+UFile (package = )
+    UClass (name = CommentsOnPropertiesKt)
+        UField (name = boo)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UField (name = bar)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UField (name = baq)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UMethod (name = getBoo)
+        UMethod (name = getBar)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getBaq)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getBaz)
+            UBlockExpression
+                UReturnExpression
+                    ULiteralExpression (value = 42)
+    UClass (name = Test)
+        UField (name = foo)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UField (name = far)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UField (name = faq)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            ULiteralExpression (value = 42)
+        UMethod (name = getFoo)
+        UMethod (name = getFar)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getFaq)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getFaz)
+            UBlockExpression
+                UReturnExpression
+                    ULiteralExpression (value = 42)
+        UMethod (name = Test)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.render.txt
new file mode 100644
index 000000000000..beb1b266e6f5
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/commentsOnProperties.render.txt
@@ -0,0 +1,32 @@
+public final class CommentsOnPropertiesKt {
+    @org.jetbrains.annotations.NotNull private static final var boo: int = 42
+    @org.jetbrains.annotations.NotNull private static final var bar: int = 42
+    @org.jetbrains.annotations.NotNull private static final var baq: int = 42
+    public static final fun getBoo() : int = UastEmptyExpression
+    public static final fun getBar() : int {
+        return field
+    }
+    public static final fun getBaq() : int {
+        return field
+    }
+    public static final fun getBaz() : int {
+        return 42
+    }
+}
+
+public final class Test {
+    @org.jetbrains.annotations.NotNull private final var foo: int = 42
+    @org.jetbrains.annotations.NotNull private final var far: int = 42
+    @org.jetbrains.annotations.NotNull private final var faq: int = 42
+    public final fun getFoo() : int = UastEmptyExpression
+    public final fun getFar() : int {
+        return field
+    }
+    public final fun getFaq() : int {
+        return field
+    }
+    public final fun getFaz() : int {
+        return 42
+    }
+    public fun Test() = UastEmptyExpression
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.comments.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.comments.txt
index 5b00c9cf37c2..8b7aea4b9618 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.comments.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.comments.txt
@@ -1,14 +1,30 @@
-KotlinUFile(
-    KotlinUClass(
-        KotlinUMethod(
+KotlinUFile:facade.kt(
+    KotlinUClass:Utils(
+        KotlinUMethod:foo(
             UComment(// Single-line comment bound to fun foo)
         )
-        KotlinUMethod(
+        KotlinUMethod:buzz(
             UComment(/*
              * Multi-line comment bound to extension fun buzz
              */)
-            KotlinReceiverUParameter(
+            KotlinReceiverUParameter:$this$buzz(
             )
         )
+        KotlinUMethod:getBoo(
+            UComment(/**
+             * Multi-line document bound to property boo (w/ initializer)
+             */)
+        )
+        KotlinUMethod:getBar(
+            UComment(// Single-line comment bound to getter for property bar)
+        )
+        KotlinUMethod:getBaq(
+            UComment(// Single-line comment bound to property baq (w/ backing field access))
+        )
+        KotlinUMethod:getBaz(
+            UComment(/**
+             * Multi-line document bound to property baz (w/o backing field)
+             */)
+        )
     )
-)
\ No newline at end of file
+)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.kt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.kt
index 9aeab10eb91b..cd3a559340af 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.kt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.kt
@@ -12,3 +12,24 @@ fun foo(): Int = 42
 fun String.buzz(): String {
     return "$this... zzz..."
 }
+
+/**
+ * Multi-line document bound to property boo (w/ initializer)
+ */
+val boo = 42
+
+/**
+ * Multi-line document bound to property bar (w/ backing field access)
+ */
+val bar = 42
+    // Single-line comment bound to getter for property bar
+    get() = field
+
+// Single-line comment bound to property baq (w/ backing field access)
+val baq = 42
+    get() = field
+
+/**
+ * Multi-line document bound to property baz (w/o backing field)
+ */
+val baz get() = 42
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.log.txt
index 5a288990156c..2e76218eac2f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.log.txt
@@ -15,4 +15,17 @@ UFile (package = declaration)
                 UReturnExpression
                     UPolyadicExpression (operator = +)
                         UThisExpression (label = null)
-                        ULiteralExpression (value = "... zzz...")
\ No newline at end of file
+                        ULiteralExpression (value = "... zzz...")
+        UMethod (name = getBoo)
+        UMethod (name = getBar)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getBaq)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = field)
+        UMethod (name = getBaz)
+            UBlockExpression
+                UReturnExpression
+                    ULiteralExpression (value = 42)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.render.txt
index ceefb3941ddb..cc6aebc0255a 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/facade.render.txt
@@ -9,4 +9,14 @@ public final class Utils {
     public static final fun buzz(@org.jetbrains.annotations.NotNull $this$buzz: java.lang.String) : java.lang.String {
         return this + "... zzz..."
     }
+    public static final fun getBoo() : int = UastEmptyExpression
+    public static final fun getBar() : int {
+        return field
+    }
+    public static final fun getBaq() : int {
+        return field
+    }
+    public static final fun getBaz() : int {
+        return 42
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/objects.comments.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/objects.comments.txt
index 2be1ec734fb1..88ee96ae97d6 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/objects.comments.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/declaration/objects.comments.txt
@@ -1,38 +1,37 @@
-KotlinUFile(
+KotlinUFile:objects.kt(
     UComment(// file comment)
-    KotlinUClass(
-        KotlinUField(
+    KotlinUClass:ObjectsKt(
+        KotlinUField:topRunnable(
             UComment(// Single-line comment bound to top-level property)
-            KotlinUAnonymousClass(
-                KotlinUMethod(
+            KotlinUAnonymousClass:<no name provided>(
+                KotlinUMethod:run(
                 )
-                KotlinUMethod(
+                KotlinUMethod:<no name provided>(
                 )
             )
         )
-        KotlinUMethod(
-            UComment(// Single-line comment bound to top-level property)
+        KotlinUMethod:getTopRunnable(
         )
-        KotlinUMethod(
+        KotlinUMethod:main(
         )
     )
-    KotlinUClass(
+    KotlinUClass:RunnableManager(
         UComment(// Single-line comment bound to object)
-        KotlinUField(
+        KotlinUField:tasks(
         )
-        KotlinUField(
+        KotlinUField:INSTANCE(
             UComment(// Single-line comment bound to object)
         )
-        KotlinUMethod(
+        KotlinUMethod:getTasks(
         )
-        KotlinUMethod(
-            KotlinUParameter(
+        KotlinUMethod:register(
+            KotlinUParameter:runnable(
             )
         )
-        KotlinUMethod(
+        KotlinUMethod:runAll(
         )
-        KotlinConstructorUMethod(
+        KotlinConstructorUMethod:RunnableManager(
             UComment(// Single-line comment bound to object)
         )
     )
-)
\ No newline at end of file
+)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.fe10.txt
deleted file mode 100644
index c14917cd197f..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.fe10.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Target -> UAnnotation (fqName = kotlin.annotation.Target)
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE)
-MyAnnotation -> UClass (name = MyAnnotation)
-a -> UAnnotationMethod (name = a)
-Int -> USimpleNameReferenceExpression (identifier = Int)
-b -> UAnnotationMethod (name = b)
-String -> USimpleNameReferenceExpression (identifier = String)
-c -> UAnnotationMethod (name = c)
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
-foo -> UMethod (name = foo)
-list -> UParameter (name = list)
-List -> USimpleNameReferenceExpression (identifier = List)
-MyAnnotation -> UAnnotation (fqName = MyAnnotation)
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE)
-String -> USimpleNameReferenceExpression (identifier = String)
-    a -> ULocalVariable (name = a)
-    list -> USimpleNameReferenceExpression (identifier = list)
-    b -> ULocalVariable (name = b)
-    MyAnnotation -> UAnnotation (fqName = MyAnnotation)
-    AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
-    FILE -> USimpleNameReferenceExpression (identifier = FILE)
-    String -> USimpleNameReferenceExpression (identifier = String)
-    c -> ULocalVariable (name = c)
-    b -> USimpleNameReferenceExpression (identifier = b)
-    v -> ULocalVariable (name = v)
-    UndefinedAnnotation -> UAnnotation (fqName = null)
-    unresolvedVar -> USimpleNameReferenceExpression (identifier = unresolvedVar)
-    String -> USimpleNameReferenceExpression (identifier = String)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.txt
new file mode 100644
index 000000000000..f036603ec294
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.identifiers.txt
@@ -0,0 +1,30 @@
+Target -> UAnnotation (fqName = kotlin.annotation.Target)
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE)
+MyAnnotation -> UClass (name = MyAnnotation)
+a -> UAnnotationMethod (name = a)
+Int -> USimpleNameReferenceExpression (identifier = Int)
+b -> UAnnotationMethod (name = b)
+String -> USimpleNameReferenceExpression (identifier = String)
+c -> UAnnotationMethod (name = c)
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
+foo -> UMethod (name = foo)
+list -> UParameter (name = list)
+List -> USimpleNameReferenceExpression (identifier = List)
+MyAnnotation -> UAnnotation (fqName = MyAnnotation)
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE)
+String -> USimpleNameReferenceExpression (identifier = String)
+    a -> ULocalVariable (name = a)
+    list -> USimpleNameReferenceExpression (identifier = list)
+    b -> ULocalVariable (name = b)
+    MyAnnotation -> UAnnotation (fqName = MyAnnotation)
+    AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget)
+    FILE -> USimpleNameReferenceExpression (identifier = FILE)
+    String -> USimpleNameReferenceExpression (identifier = String)
+    c -> ULocalVariable (name = c)
+    b -> USimpleNameReferenceExpression (identifier = b)
+    v -> ULocalVariable (name = v)
+    UndefinedAnnotation -> UAnnotation (fqName = null)
+    unresolvedVar -> USimpleNameReferenceExpression (identifier = unresolvedVar)
+    String -> USimpleNameReferenceExpression (identifier = String)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.fe10.txt
deleted file mode 100644
index b511ae3e0ff4..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.fe10.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Target -> UAnnotation (fqName = kotlin.annotation.Target) from KtNameReferenceExpression
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtDotQualifiedExpression
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtNameReferenceExpression
-Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression
-String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
-List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression
-MyAnnotation -> UAnnotation (fqName = MyAnnotation) from KtNameReferenceExpression
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtDotQualifiedExpression
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
-TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtNameReferenceExpression
-String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
-list -> USimpleNameReferenceExpression (identifier = list) from KtNameReferenceExpression
-MyAnnotation -> UAnnotation (fqName = MyAnnotation) from KtNameReferenceExpression
-FILE -> USimpleNameReferenceExpression (identifier = FILE) from KtDotQualifiedExpression
-AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
-FILE -> USimpleNameReferenceExpression (identifier = FILE) from KtNameReferenceExpression
-String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
-b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression
-UndefinedAnnotation -> UAnnotation (fqName = null) from KtNameReferenceExpression
-unresolvedVar -> USimpleNameReferenceExpression (identifier = unresolvedVar) from KtNameReferenceExpression
-String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.txt
new file mode 100644
index 000000000000..c21dc35f62c6
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedTypes.refNames.txt
@@ -0,0 +1,23 @@
+Target -> UAnnotation (fqName = kotlin.annotation.Target) from KtNameReferenceExpression
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtDotQualifiedExpression
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtNameReferenceExpression
+Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression
+String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
+List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression
+MyAnnotation -> UAnnotation (fqName = MyAnnotation) from KtNameReferenceExpression
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtDotQualifiedExpression
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
+TYPE -> USimpleNameReferenceExpression (identifier = TYPE) from KtNameReferenceExpression
+String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
+list -> USimpleNameReferenceExpression (identifier = list) from KtNameReferenceExpression
+MyAnnotation -> UAnnotation (fqName = MyAnnotation) from KtNameReferenceExpression
+FILE -> USimpleNameReferenceExpression (identifier = FILE) from KtDotQualifiedExpression
+AnnotationTarget -> USimpleNameReferenceExpression (identifier = AnnotationTarget) from KtNameReferenceExpression
+FILE -> USimpleNameReferenceExpression (identifier = FILE) from KtNameReferenceExpression
+String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
+b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression
+UndefinedAnnotation -> UAnnotation (fqName = null) from KtNameReferenceExpression
+unresolvedVar -> USimpleNameReferenceExpression (identifier = unresolvedVar) from KtNameReferenceExpression
+String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.fe10.txt
deleted file mode 100644
index 1210fe86ab61..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.fe10.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Cls -> UClass (name = Cls)
-a -> UParameter (name = a)
-Long -> USimpleNameReferenceExpression (identifier = Long)
-b -> UParameter (name = b)
-Long -> USimpleNameReferenceExpression (identifier = Long)
-this -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
-a -> USimpleNameReferenceExpression (identifier = a)
-a -> USimpleNameReferenceExpression (identifier = a)
-a -> USimpleNameReferenceExpression (identifier = a)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.txt
new file mode 100644
index 000000000000..4e6933442122
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.identifiers.txt
@@ -0,0 +1,9 @@
+Cls -> UClass (name = Cls)
+a -> UParameter (name = a)
+Long -> USimpleNameReferenceExpression (identifier = Long)
+b -> UParameter (name = b)
+Long -> USimpleNameReferenceExpression (identifier = Long)
+this -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
+a -> USimpleNameReferenceExpression (identifier = a)
+a -> USimpleNameReferenceExpression (identifier = a)
+a -> USimpleNameReferenceExpression (identifier = a)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.fe10.txt
deleted file mode 100644
index 5e9b184b51f1..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.fe10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression
-Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression
-a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
-a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
-a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.txt
new file mode 100644
index 000000000000..acac89b1e44e
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyIdentifiers/BrokenDataClass.refNames.txt
@@ -0,0 +1,5 @@
+Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression
+Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression
+a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
+a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
+a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.fe10.txt
deleted file mode 100644
index 7fa5d6a3449d..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.fe10.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-UFile (package = )
-    UClass (name = AnnotatedTypesKt)
-        UMethod (name = foo)
-            UParameter (name = list)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UDeclarationsExpression
-                    ULocalVariable (name = a)
-                        UArrayAccessExpression
-                            USimpleNameReferenceExpression (identifier = list)
-                            ULiteralExpression (value = 2)
-                UDeclarationsExpression
-                    ULocalVariable (name = b)
-                        ULiteralExpression (value = "abc")
-                UDeclarationsExpression
-                    ULocalVariable (name = c)
-                        USimpleNameReferenceExpression (identifier = b)
-                UDeclarationsExpression
-                    ULocalVariable (name = v)
-                        ULiteralExpression (value = "abc")
-    UClass (name = MyAnnotation)
-        UAnnotation (fqName = kotlin.annotation.Target)
-            UNamedExpression (name = allowedTargets)
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = AnnotationTarget)
-                    USimpleNameReferenceExpression (identifier = TYPE)
-        UAnnotationMethod (name = a)
-        UAnnotationMethod (name = b)
-        UAnnotationMethod (name = c)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.txt
new file mode 100644
index 000000000000..27faea1e4250
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.log.txt
@@ -0,0 +1,29 @@
+UFile (package = )
+    UClass (name = AnnotatedTypesKt)
+        UMethod (name = foo)
+            UParameter (name = list)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UDeclarationsExpression
+                    ULocalVariable (name = a)
+                        UArrayAccessExpression
+                            USimpleNameReferenceExpression (identifier = list)
+                            ULiteralExpression (value = 2)
+                UDeclarationsExpression
+                    ULocalVariable (name = b)
+                        ULiteralExpression (value = "abc")
+                UDeclarationsExpression
+                    ULocalVariable (name = c)
+                        USimpleNameReferenceExpression (identifier = b)
+                UDeclarationsExpression
+                    ULocalVariable (name = v)
+                        ULiteralExpression (value = "abc")
+    UClass (name = MyAnnotation)
+        UAnnotation (fqName = kotlin.annotation.Target)
+            UNamedExpression (name = allowedTargets)
+                UQualifiedReferenceExpression
+                    USimpleNameReferenceExpression (identifier = AnnotationTarget)
+                    USimpleNameReferenceExpression (identifier = TYPE)
+        UAnnotationMethod (name = a)
+        UAnnotationMethod (name = b)
+        UAnnotationMethod (name = c)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.fe10.txt
deleted file mode 100644
index 57dbc182cd0c..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.fe10.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-public final class AnnotatedTypesKt {
-    public static final fun foo(@org.jetbrains.annotations.NotNull list: java.util.List<java.lang.String>) : void {
-        var a: java.lang.String = list[2]
-        var b: java.lang.String = "abc"
-        var c: java.lang.String = b
-        var v: java.lang.String = "abc"
-    }
-}
-
-public abstract annotation MyAnnotation {
-    public abstract fun a() : int = UastEmptyExpression
-    public abstract fun b() : java.lang.String = UastEmptyExpression
-    public abstract fun c() : kotlin.annotation.AnnotationTarget = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.txt
new file mode 100644
index 000000000000..2f4885341e62
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/AnnotatedTypes.render.txt
@@ -0,0 +1,14 @@
+public final class AnnotatedTypesKt {
+    public static final fun foo(@org.jetbrains.annotations.NotNull list: java.util.List<java.lang.String>) : void {
+        var a: java.lang.String = list[2]
+        var b: java.lang.String = "abc"
+        var c: java.lang.String = b
+        var v: java.lang.String = "abc"
+    }
+}
+
+public abstract annotation MyAnnotation {
+    public abstract fun a() : int = UastEmptyExpression
+    public abstract fun b() : java.lang.String = UastEmptyExpression
+    public abstract fun c() : kotlin.annotation.AnnotationTarget = UastEmptyExpression
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.log.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.log.fir.txt
new file mode 100644
index 000000000000..edd116b656f7
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.log.fir.txt
@@ -0,0 +1,21 @@
+UFile (package = )
+    UClass (name = Cls)
+        UField (name = a)
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+        UMethod (name = getA)
+        UMethod (name = Cls)
+            UParameter (name = a)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = b)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
+                    UIdentifier (Identifier (this))
+                    USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
+                    USimpleNameReferenceExpression (identifier = a)
+                    USimpleNameReferenceExpression (identifier = a)
+                    USimpleNameReferenceExpression (identifier = a)
+        UMethod (name = component1)
+        UMethod (name = copy)
+            UParameter (name = a)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.render.fir.txt
new file mode 100644
index 000000000000..2ca5b283dbea
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/BrokenDataClass.render.fir.txt
@@ -0,0 +1,9 @@
+public final class Cls : <ErrorType> {
+    @org.jetbrains.annotations.NotNull private final var a: long
+    public final fun getA() : long = UastEmptyExpression
+    public fun Cls(@org.jetbrains.annotations.NotNull a: long, @org.jetbrains.annotations.NotNull b: long) {
+        <anonymous class>(a, a, a)
+    }
+    public final fun component1() : long = UastEmptyExpression
+    public final fun copy(@org.jetbrains.annotations.NotNull a: long) : Cls = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.log.txt
index 6d78974fcd0f..e4c53641f8c0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.log.txt
@@ -76,4 +76,8 @@ UFile (package = )
         UEnumConstant (name = FALSE)
             UAnnotation (fqName = null)
             USimpleNameReferenceExpression (identifier = MyBooleanEnum)
-        UMethod (name = MyBooleanEnum)
\ No newline at end of file
+        UMethod (name = MyBooleanEnum)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.render.txt
index 3c5e5b4d533b..84458298a71b 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/CommentOwners.render.txt
@@ -41,4 +41,6 @@ public enum MyBooleanEnum {
     @null TRUE
     @null FALSE
     private fun MyBooleanEnum() = UastEmptyExpression
-}
\ No newline at end of file
+    public static fun values() : MyBooleanEnum[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : MyBooleanEnum = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fe10.txt
deleted file mode 100644
index 0b50ead54f03..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fe10.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-public final class MyColor {
-    @org.jetbrains.annotations.NotNull private final var x: int
-    @org.jetbrains.annotations.NotNull private final var y: int
-    @org.jetbrains.annotations.NotNull private final var z: int
-    public final fun getX() : int = UastEmptyExpression
-    public final fun getY() : int = UastEmptyExpression
-    public final fun getZ() : int = UastEmptyExpression
-    public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression
-}
-
-public final class Some {
-    @org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy
-    @org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({
-        return <init>(1, 2, 3)
-    })
-    @org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)
-    public final fun getDelegate() : MyColor = UastEmptyExpression
-    public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression
-    public final fun getNonLazy() : MyColor = UastEmptyExpression
-    public fun Some() = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fir.txt
deleted file mode 100644
index 0cfa6a92f839..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.fir.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-public final class MyColor {
-    @org.jetbrains.annotations.NotNull private final var x: int
-    @org.jetbrains.annotations.NotNull private final var y: int
-    @org.jetbrains.annotations.NotNull private final var z: int
-    public final fun getX() : int = UastEmptyExpression
-    public final fun getY() : int = UastEmptyExpression
-    public final fun getZ() : int = UastEmptyExpression
-    public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression
-}
-
-public final class Some {
-    @org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<MyColor>
-    @org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({
-        return <init>(1, 2, 3)
-    })
-    @org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)
-    public final fun getDelegate() : MyColor = UastEmptyExpression
-    public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression
-    public final fun getNonLazy() : MyColor = UastEmptyExpression
-    public fun Some() = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.txt
new file mode 100644
index 000000000000..72324302eb1b
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Delegate.render.txt
@@ -0,0 +1,21 @@
+public final class MyColor {
+    @org.jetbrains.annotations.NotNull private final var x: int
+    @org.jetbrains.annotations.NotNull private final var y: int
+    @org.jetbrains.annotations.NotNull private final var z: int
+    public final fun getX() : int = UastEmptyExpression
+    public final fun getY() : int = UastEmptyExpression
+    public final fun getZ() : int = UastEmptyExpression
+    public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression
+}
+
+public final class Some {
+    @org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>
+    @org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({
+        return <init>(1, 2, 3)
+    })
+    @org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)
+    public final fun getDelegate() : MyColor = UastEmptyExpression
+    public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression
+    public final fun getNonLazy() : MyColor = UastEmptyExpression
+    public fun Some() = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.log.txt
index f7d913b021de..06fe82ce71ab 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.log.txt
@@ -16,4 +16,8 @@ UFile (package = )
         UMethod (name = getValue)
         UMethod (name = Style)
             UParameter (name = value)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
\ No newline at end of file
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.render.txt
index 0ad6761286b6..1863fddafe55 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValueMembers.render.txt
@@ -9,4 +9,6 @@ public enum Style {
     public abstract fun getExitAnimation() : java.lang.String = UastEmptyExpression
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression
-}
\ No newline at end of file
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.log.txt
index f936d60f28ab..02db2382f3dc 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.log.txt
@@ -21,4 +21,8 @@ UFile (package = )
         UMethod (name = getValue)
         UMethod (name = Style)
             UParameter (name = value)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
\ No newline at end of file
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.render.txt
index 3fa642007648..82d442773aa8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/EnumValuesConstructors.render.txt
@@ -6,4 +6,6 @@ public enum Style {
     @null UNKNOWN(null)
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression
-}
\ No newline at end of file
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/LambdaReturn.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/LambdaReturn.render.fir.txt
index 226ad7c33d58..8f584bc87858 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/LambdaReturn.render.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/LambdaReturn.render.fir.txt
@@ -39,7 +39,7 @@ public final class LambdaReturnKt {
             listOf(1)
         }
     }
-    private static fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Integer>) : void {
+    private static final fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer>) : void {
         invoke(1)
     }
 }
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fe10.txt
deleted file mode 100644
index 0f4ec9edd55a..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fe10.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-public final class PropertyDelegateKt {
-    @org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy
-    @org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy
-    public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression
-    public static final fun localPropertyTest() : void {
-        var sdCardPathLocal: java.lang.String
-    }
-    public static final fun getAnnotatedDelegate() : int = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fir.txt
deleted file mode 100644
index d137dd00e14b..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.fir.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-public final class PropertyDelegateKt {
-    @org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<java.lang.String>
-    @org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<java.lang.Integer>
-    public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression
-    public static final fun localPropertyTest() : void {
-        var sdCardPathLocal: java.lang.String
-    }
-    public static final fun getAnnotatedDelegate() : int = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.txt
new file mode 100644
index 000000000000..7cc7e47d8f63
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/PropertyDelegate.render.txt
@@ -0,0 +1,9 @@
+public final class PropertyDelegateKt {
+    @org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<? extends java.lang.String>
+    @org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<? extends java.lang.Integer>
+    public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression
+    public static final fun localPropertyTest() : void {
+        var sdCardPathLocal: java.lang.String
+    }
+    public static final fun getAnnotatedDelegate() : int = UastEmptyExpression
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fe10.txt
deleted file mode 100644
index 029694e885dc..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fe10.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-UFile (package = test.pkg)
-    UClass (name = ReifiedKt)
-        UMethod (name = systemService2)
-            UParameter (name = $this$systemService2)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-        UMethod (name = systemService1)
-            UParameter (name = $this$systemService1)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-    UClass (name = Context)
-        UMethod (name = ownSystemService2)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-        UMethod (name = Context)
-        UMethod (name = ownSystemService1)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fir.txt
deleted file mode 100644
index b579bc664941..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.fir.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-UFile (package = test.pkg)
-    UClass (name = ReifiedKt)
-        UMethod (name = systemService1)
-            UParameter (name = $this$systemService1)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-        UMethod (name = systemService2)
-            UParameter (name = $this$systemService2)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-    UClass (name = Context)
-        UMethod (name = Context)
-        UMethod (name = ownSystemService1)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
-        UMethod (name = ownSystemService2)
-            UBlockExpression
-                UReturnExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (getSystemService))
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
-                        UQualifiedReferenceExpression
-                            UClassLiteralExpression
-                            USimpleNameReferenceExpression (identifier = java)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.txt
new file mode 100644
index 000000000000..51a92e837eaa
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.log.txt
@@ -0,0 +1,44 @@
+UFile (package = test.pkg)
+    UClass (name = ReifiedKt)
+        UMethod (name = systemService2)
+            UParameter (name = $this$systemService2)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (getSystemService))
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
+                        UQualifiedReferenceExpression
+                            UClassLiteralExpression
+                            USimpleNameReferenceExpression (identifier = java)
+        UMethod (name = systemService1)
+            UParameter (name = $this$systemService1)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (getSystemService))
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
+                        UQualifiedReferenceExpression
+                            UClassLiteralExpression
+                            USimpleNameReferenceExpression (identifier = java)
+    UClass (name = Context)
+        UMethod (name = ownSystemService2)
+            UBlockExpression
+                UReturnExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (getSystemService))
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
+                        UQualifiedReferenceExpression
+                            UClassLiteralExpression
+                            USimpleNameReferenceExpression (identifier = java)
+        UMethod (name = Context)
+        UMethod (name = ownSystemService1)
+            UBlockExpression
+                UReturnExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (getSystemService))
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
+                        UQualifiedReferenceExpression
+                            UClassLiteralExpression
+                            USimpleNameReferenceExpression (identifier = java)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fe10.txt
deleted file mode 100644
index e8be4121e7c4..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fe10.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test.pkg
-
-public final class ReifiedKt {
-    public static final fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : error.NonExistentClass {
-        return <anonymous class>(java.lang.String.java)
-    }
-    public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {
-        return <anonymous class>(T.java)
-    }
-}
-
-public final class Context {
-    public final fun ownSystemService2() : error.NonExistentClass {
-        return <anonymous class>(java.lang.String.java)
-    }
-    public fun Context() = UastEmptyExpression
-    public fun ownSystemService1() : <ErrorType> {
-        return <anonymous class>(T.java)
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fir.txt
deleted file mode 100644
index 5eae74c144a6..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.fir.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-package test.pkg
-
-public final class ReifiedKt {
-    public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {
-        return <anonymous class>(T.java)
-    }
-    public static fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : <ErrorType> {
-        return <anonymous class>(java.lang.String.java)
-    }
-}
-
-public final class Context {
-    public fun Context() = UastEmptyExpression
-    public fun ownSystemService1() : <ErrorType> {
-        return <anonymous class>(T.java)
-    }
-    public fun ownSystemService2() : <ErrorType> {
-        return <anonymous class>(java.lang.String.java)
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.txt
new file mode 100644
index 000000000000..b9d13fec9cea
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Reified.render.txt
@@ -0,0 +1,20 @@
+package test.pkg
+
+public final class ReifiedKt {
+    public static final fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : error.NonExistentClass {
+        return <anonymous class>(java.lang.String.java)
+    }
+    public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {
+        return <anonymous class>(T.java)
+    }
+}
+
+public final class Context {
+    public final fun ownSystemService2() : error.NonExistentClass {
+        return <anonymous class>(java.lang.String.java)
+    }
+    public fun Context() = UastEmptyExpression
+    public fun ownSystemService1() : <ErrorType> {
+        return <anonymous class>(T.java)
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fe10.txt
deleted file mode 100644
index b3576b914da8..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fe10.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-UFile (package = )
-    UClass (name = ReifiedResolveKt)
-        UMethod (name = bar)
-            UParameter (name = init)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-                ULambdaExpression
-                    UBlockExpression
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
-                    ULiteralExpression (value = "message")
-        UMethod (name = resolve)
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (foo))
-                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = x)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (foo))
-                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (bar))
-                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = y)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (bar))
-                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = z)
-                        UQualifiedReferenceExpression
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (listOf))
-                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                                ULiteralExpression (value = "foo")
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                                UIdentifier (Identifier (filterIsInstance))
-                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null)
-        UMethod (name = foo)
-            UParameter (name = init)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-                ULambdaExpression
-                    UBlockExpression
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
-                    ULiteralExpression (value = "message")
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fir.txt
deleted file mode 100644
index c78b44a92f62..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.fir.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-UFile (package = )
-    UClass (name = ReifiedResolveKt)
-        UMethod (name = resolve)
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (foo))
-                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = x)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (foo))
-                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (bar))
-                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = y)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (bar))
-                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
-                UDeclarationsExpression
-                    ULocalVariable (name = z)
-                        UQualifiedReferenceExpression
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (listOf))
-                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                                ULiteralExpression (value = "foo")
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                                UIdentifier (Identifier (filterIsInstance))
-                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null)
-        UMethod (name = foo)
-            UParameter (name = init)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-                ULambdaExpression
-                    UBlockExpression
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
-                    ULiteralExpression (value = "message")
-        UMethod (name = bar)
-            UParameter (name = init)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-                ULambdaExpression
-                    UBlockExpression
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
-                    ULiteralExpression (value = "message")
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.txt
new file mode 100644
index 000000000000..dcdaf8e8ac1a
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.log.txt
@@ -0,0 +1,50 @@
+UFile (package = )
+    UClass (name = ReifiedResolveKt)
+        UMethod (name = bar)
+            UParameter (name = init)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+                ULambdaExpression
+                    UBlockExpression
+            UBlockExpression
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                    UIdentifier (Identifier (TODO))
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
+                    ULiteralExpression (value = "message")
+        UMethod (name = resolve)
+            UBlockExpression
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                    UIdentifier (Identifier (foo))
+                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
+                UDeclarationsExpression
+                    ULocalVariable (name = x)
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                            UIdentifier (Identifier (foo))
+                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                    UIdentifier (Identifier (bar))
+                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
+                UDeclarationsExpression
+                    ULocalVariable (name = y)
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                            UIdentifier (Identifier (bar))
+                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null)
+                UDeclarationsExpression
+                    ULocalVariable (name = z)
+                        UQualifiedReferenceExpression
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                                UIdentifier (Identifier (listOf))
+                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                                ULiteralExpression (value = "foo")
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                                UIdentifier (Identifier (filterIsInstance))
+                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null)
+        UMethod (name = foo)
+            UParameter (name = init)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+                ULambdaExpression
+                    UBlockExpression
+            UBlockExpression
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                    UIdentifier (Identifier (TODO))
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
+                    ULiteralExpression (value = "message")
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fe10.txt
deleted file mode 100644
index 9f259b1bbfcc..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fe10.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-public final class ReifiedResolveKt {
-    public static final fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit>) : T {
-        TODO("message")
-    }
-    public static final fun resolve() : void {
-        foo()
-        var x: java.lang.String = foo()
-        bar()
-        var y: java.lang.String = bar()
-        var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()
-    }
-    public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {
-        TODO("message")
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fir.txt
deleted file mode 100644
index bda58d60e72d..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.fir.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-public final class ReifiedResolveKt {
-    public static final fun resolve() : void {
-        foo()
-        var x: java.lang.String = foo()
-        bar()
-        var y: java.lang.String = bar()
-        var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()
-    }
-    public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {
-        TODO("message")
-    }
-    public static fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {
-        TODO("message")
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.txt
new file mode 100644
index 000000000000..d99870b7df01
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedResolve.render.txt
@@ -0,0 +1,15 @@
+public final class ReifiedResolveKt {
+    public static final fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit>) : T {
+        TODO("message")
+    }
+    public static final fun resolve() : void {
+        foo()
+        var x: java.lang.String = foo()
+        bar()
+        var y: java.lang.String = bar()
+        var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()
+    }
+    public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {
+        TODO("message")
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fe10.txt
deleted file mode 100644
index 3f1f82b5c169..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fe10.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = )
-    UClass (name = ReifiedReturnTypeKt)
-        UMethod (name = function1)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-        UMethod (name = function2)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function2CharSequence)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = copyWhenGreater)
-            UParameter (name = list)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = threshold)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = threshold2)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = threshold2)
-        UMethod (name = function3)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-        UMethod (name = function4)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function5)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    ULiteralExpression (value = 42)
-        UMethod (name = function6)
-            UParameter (name = $this$function6)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function7)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function8)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function9)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function10)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function11)
-            UParameter (name = $this$function11)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function11CharSequence)
-            UParameter (name = $this$function11CharSequence)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function12CharSequence)
-            UParameter (name = $this$function12CharSequence)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-    UClass (name = Foo)
-        UMethod (name = Foo)
-        UMethod (name = foo)
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt
deleted file mode 100644
index 0f62db7f14f6..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = )
-    UClass (name = ReifiedReturnTypeKt)
-        UMethod (name = copyWhenGreater)
-            UParameter (name = list)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = threshold)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = threshold2)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = threshold2)
-        UMethod (name = function1)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-        UMethod (name = function2)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function2CharSequence)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function3)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-        UMethod (name = function4)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function5)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    ULiteralExpression (value = 42)
-        UMethod (name = function6)
-            UParameter (name = $this$function6)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function7)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function8)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function9)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function10)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function11)
-            UParameter (name = $this$function11)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function11CharSequence)
-            UParameter (name = $this$function11CharSequence)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-        UMethod (name = function12CharSequence)
-            UParameter (name = $this$function12CharSequence)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = i)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UParameter (name = s)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UReturnExpression
-                    USimpleNameReferenceExpression (identifier = t)
-    UClass (name = Foo)
-        UMethod (name = Foo)
-        UMethod (name = foo)
-            UBlockExpression
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                    UIdentifier (Identifier (TODO))
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.txt
new file mode 100644
index 000000000000..6620b6cc9e9a
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.txt
@@ -0,0 +1,163 @@
+UFile (package = )
+    UClass (name = ReifiedReturnTypeKt)
+        UMethod (name = function1)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+        UMethod (name = function2)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function2CharSequence)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = copyWhenGreater)
+            UParameter (name = list)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = threshold)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = threshold2)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = threshold2)
+        UMethod (name = function3)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+        UMethod (name = function4)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function5)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    ULiteralExpression (value = 42)
+        UMethod (name = function6)
+            UParameter (name = $this$function6)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function7)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function8)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function9)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function10)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function11)
+            UParameter (name = $this$function11)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function11CharSequence)
+            UParameter (name = $this$function11CharSequence)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+        UMethod (name = function12CharSequence)
+            UParameter (name = $this$function12CharSequence)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = i)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UParameter (name = s)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UReturnExpression
+                    USimpleNameReferenceExpression (identifier = t)
+    UClass (name = Foo)
+        UMethod (name = Foo)
+        UMethod (name = foo)
+            UBlockExpression
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                    UIdentifier (Identifier (TODO))
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fe10.txt
deleted file mode 100644
index 23b642ef56ea..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fe10.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-public final class ReifiedReturnTypeKt {
-    public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
-    }
-    public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {
-        return threshold2
-    }
-    public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
-    }
-    public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {
-        return 42
-    }
-    public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {
-        return t
-    }
-}
-
-public final class Foo {
-    public fun Foo() = UastEmptyExpression
-    public fun foo() : Z {
-        TODO()
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt
deleted file mode 100644
index 4058f520b571..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-public final class ReifiedReturnTypeKt {
-    public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {
-        return threshold2
-    }
-    public static fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
-    }
-    public static fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
-    }
-    public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {
-        return 42
-    }
-    public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
-        return t
-    }
-    public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {
-        return t
-    }
-}
-
-public final class Foo {
-    public fun Foo() = UastEmptyExpression
-    public fun foo() : Z {
-        TODO()
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.txt
new file mode 100644
index 000000000000..5504297ed1c3
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.txt
@@ -0,0 +1,52 @@
+public final class ReifiedReturnTypeKt {
+    public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
+    }
+    public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {
+        return threshold2
+    }
+    public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {
+    }
+    public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {
+        return 42
+    }
+    public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {
+        return t
+    }
+    public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {
+        return t
+    }
+}
+
+public final class Foo {
+    public fun Foo() = UastEmptyExpression
+    public fun foo() : Z {
+        TODO()
+    }
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fe10.txt
deleted file mode 100644
index b475b825b3dc..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fe10.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-UFile (package = )
-    UClass (name = ResolveKt)
-        UMethod (name = bar)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                        UIdentifier (Identifier (A))
-                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (foo))
-                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                        UIdentifier (Identifier (A))
-                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (inlineFoo))
-                        USimpleNameReferenceExpression (identifier = inlineFoo, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                            UIdentifier (Identifier (A))
-                            USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (forEach))
-                        USimpleNameReferenceExpression (identifier = forEach, resolvesTo = null)
-                        ULambdaExpression
-                            UParameter (name = it)
-                            UBlockExpression
-                                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                    UIdentifier (Identifier (println))
-                                    USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
-                                    USimpleNameReferenceExpression (identifier = it)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (joinToString))
-                        USimpleNameReferenceExpression (identifier = joinToString, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    USimpleNameReferenceExpression (identifier = size)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    USimpleNameReferenceExpression (identifier = indices)
-                UDeclarationsExpression
-                    ULocalVariable (name = date)
-                        UQualifiedReferenceExpression
-                            UQualifiedReferenceExpression
-                                USimpleNameReferenceExpression (identifier = java)
-                                USimpleNameReferenceExpression (identifier = util)
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                                UIdentifier (Identifier (Date))
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Date)
-                UBinaryExpression (operator = =)
-                    UQualifiedReferenceExpression
-                        USimpleNameReferenceExpression (identifier = date)
-                        USimpleNameReferenceExpression (identifier = time)
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (time))
-                                ULiteralExpression (value = 1000)
-                    ULiteralExpression (value = 1000)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (last))
-                        USimpleNameReferenceExpression (identifier = last, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UQualifiedReferenceExpression
-                        UQualifiedReferenceExpression
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (mutableMapOf))
-                                USimpleNameReferenceExpression (identifier = mutableMapOf, resolvesTo = null)
-                                UBinaryExpression (operator = <other>)
-                                    ULiteralExpression (value = 1)
-                                    ULiteralExpression (value = "1")
-                            USimpleNameReferenceExpression (identifier = entries)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (first))
-                            USimpleNameReferenceExpression (identifier = first, resolvesTo = null)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (setValue))
-                        USimpleNameReferenceExpression (identifier = setValue, resolvesTo = null)
-                        ULiteralExpression (value = "123")
-                UDeclarationsExpression
-                    ULocalVariable (name = intRange)
-                        UBinaryExpression (operator = ..)
-                            ULiteralExpression (value = 0)
-                            ULiteralExpression (value = 3)
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = intRange)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (contains))
-                        USimpleNameReferenceExpression (identifier = contains, resolvesTo = null)
-                        UBinaryExpressionWithType
-                            ULiteralExpression (value = 2)
-                            UTypeReferenceExpression (name = int)
-                UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))
-                    UIdentifier (Identifier (IntRange))
-                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: IntRange)
-                    ULiteralExpression (value = 1)
-                    ULiteralExpression (value = 2)
-        UMethod (name = barT)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = t)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (foo))
-                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-        UMethod (name = barTL)
-            UParameter (name = listT)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = listT)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (isEmpty))
-                        USimpleNameReferenceExpression (identifier = isEmpty, resolvesTo = null)
-                UForEachExpression
-                    USimpleNameReferenceExpression (identifier = listT)
-                    UBlockExpression
-                        UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = a)
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                                UIdentifier (Identifier (foo))
-                                USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-    UClass (name = A)
-        UMethod (name = foo)
-            UBlockExpression
-        UMethod (name = inlineFoo)
-            UBlockExpression
-        UMethod (name = A)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt
deleted file mode 100644
index c698501e983d..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-UFile (package = )
-    UClass (name = ResolveKt)
-        UMethod (name = bar)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                        UIdentifier (Identifier (A))
-                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (foo))
-                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                        UIdentifier (Identifier (A))
-                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (inlineFoo))
-                        USimpleNameReferenceExpression (identifier = inlineFoo, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                            UIdentifier (Identifier (A))
-                            USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (forEach))
-                        USimpleNameReferenceExpression (identifier = forEach, resolvesTo = null)
-                        ULambdaExpression
-                            UParameter (name = it)
-                            UBlockExpression
-                                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                    UIdentifier (Identifier (println))
-                                    USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
-                                    USimpleNameReferenceExpression (identifier = it)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (joinToString))
-                        USimpleNameReferenceExpression (identifier = joinToString, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    USimpleNameReferenceExpression (identifier = size)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    USimpleNameReferenceExpression (identifier = indices)
-                UDeclarationsExpression
-                    ULocalVariable (name = date)
-                        UQualifiedReferenceExpression
-                            UQualifiedReferenceExpression
-                                USimpleNameReferenceExpression (identifier = java)
-                                USimpleNameReferenceExpression (identifier = util)
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
-                                UIdentifier (Identifier (Date))
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Date)
-                UBinaryExpression (operator = =)
-                    UQualifiedReferenceExpression
-                        USimpleNameReferenceExpression (identifier = date)
-                        USimpleNameReferenceExpression (identifier = time)
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (time))
-                                ULiteralExpression (value = 1000)
-                    ULiteralExpression (value = 1000)
-                UQualifiedReferenceExpression
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (listOf))
-                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
-                        ULiteralExpression (value = "")
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (last))
-                        USimpleNameReferenceExpression (identifier = last, resolvesTo = null)
-                UQualifiedReferenceExpression
-                    UQualifiedReferenceExpression
-                        UQualifiedReferenceExpression
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                                UIdentifier (Identifier (mutableMapOf))
-                                USimpleNameReferenceExpression (identifier = mutableMapOf, resolvesTo = null)
-                                UBinaryExpression (operator = <other>)
-                                    ULiteralExpression (value = 1)
-                                    ULiteralExpression (value = "1")
-                            USimpleNameReferenceExpression (identifier = entries)
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                            UIdentifier (Identifier (first))
-                            USimpleNameReferenceExpression (identifier = first, resolvesTo = null)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (setValue))
-                        USimpleNameReferenceExpression (identifier = setValue, resolvesTo = null)
-                        ULiteralExpression (value = "123")
-                UDeclarationsExpression
-                    ULocalVariable (name = intRange)
-                        UBinaryExpression (operator = ..)
-                            ULiteralExpression (value = 0)
-                            ULiteralExpression (value = 3)
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = intRange)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
-                        UIdentifier (Identifier (contains))
-                        USimpleNameReferenceExpression (identifier = contains, resolvesTo = null)
-                        UBinaryExpressionWithType
-                            ULiteralExpression (value = 2)
-                            UTypeReferenceExpression (name = int)
-                UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))
-                    UIdentifier (Identifier (IntRange))
-                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = null)
-                    ULiteralExpression (value = 1)
-                    ULiteralExpression (value = 2)
-        UMethod (name = barT)
-            UParameter (name = t)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = t)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (foo))
-                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-        UMethod (name = barTL)
-            UParameter (name = listT)
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
-            UBlockExpression
-                UQualifiedReferenceExpression
-                    USimpleNameReferenceExpression (identifier = listT)
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                        UIdentifier (Identifier (isEmpty))
-                        USimpleNameReferenceExpression (identifier = isEmpty, resolvesTo = null)
-                UForEachExpression
-                    USimpleNameReferenceExpression (identifier = listT)
-                    UBlockExpression
-                        UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = a)
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
-                                UIdentifier (Identifier (foo))
-                                USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
-    UClass (name = A)
-        UMethod (name = foo)
-            UBlockExpression
-        UMethod (name = A)
-        UMethod (name = inlineFoo)
-            UBlockExpression
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.txt
new file mode 100644
index 000000000000..f88219b46a8f
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.txt
@@ -0,0 +1,147 @@
+UFile (package = )
+    UClass (name = ResolveKt)
+        UMethod (name = bar)
+            UBlockExpression
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
+                        UIdentifier (Identifier (A))
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (foo))
+                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
+                        UIdentifier (Identifier (A))
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (inlineFoo))
+                        USimpleNameReferenceExpression (identifier = inlineFoo, resolvesTo = null)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (listOf))
+                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
+                            UIdentifier (Identifier (A))
+                            USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: A)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (forEach))
+                        USimpleNameReferenceExpression (identifier = forEach, resolvesTo = null)
+                        ULambdaExpression
+                            UParameter (name = it)
+                            UBlockExpression
+                                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                                    UIdentifier (Identifier (println))
+                                    USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
+                                    USimpleNameReferenceExpression (identifier = it)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (listOf))
+                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                        ULiteralExpression (value = "")
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (joinToString))
+                        USimpleNameReferenceExpression (identifier = joinToString, resolvesTo = null)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (listOf))
+                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                        ULiteralExpression (value = "")
+                    USimpleNameReferenceExpression (identifier = size)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (listOf))
+                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                        ULiteralExpression (value = "")
+                    USimpleNameReferenceExpression (identifier = indices)
+                UDeclarationsExpression
+                    ULocalVariable (name = date)
+                        UQualifiedReferenceExpression
+                            UQualifiedReferenceExpression
+                                USimpleNameReferenceExpression (identifier = java)
+                                USimpleNameReferenceExpression (identifier = util)
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))
+                                UIdentifier (Identifier (Date))
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Date)
+                UBinaryExpression (operator = =)
+                    UQualifiedReferenceExpression
+                        USimpleNameReferenceExpression (identifier = date)
+                        USimpleNameReferenceExpression (identifier = time)
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                                UIdentifier (Identifier (time))
+                                ULiteralExpression (value = 1000)
+                    ULiteralExpression (value = 1000)
+                UQualifiedReferenceExpression
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (listOf))
+                        USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
+                        ULiteralExpression (value = "")
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (last))
+                        USimpleNameReferenceExpression (identifier = last, resolvesTo = null)
+                UQualifiedReferenceExpression
+                    UQualifiedReferenceExpression
+                        UQualifiedReferenceExpression
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                                UIdentifier (Identifier (mutableMapOf))
+                                USimpleNameReferenceExpression (identifier = mutableMapOf, resolvesTo = null)
+                                UBinaryExpression (operator = <other>)
+                                    ULiteralExpression (value = 1)
+                                    ULiteralExpression (value = "1")
+                            USimpleNameReferenceExpression (identifier = entries)
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                            UIdentifier (Identifier (first))
+                            USimpleNameReferenceExpression (identifier = first, resolvesTo = null)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (setValue))
+                        USimpleNameReferenceExpression (identifier = setValue, resolvesTo = null)
+                        ULiteralExpression (value = "123")
+                UDeclarationsExpression
+                    ULocalVariable (name = intRange)
+                        UBinaryExpression (operator = ..)
+                            ULiteralExpression (value = 0)
+                            ULiteralExpression (value = 3)
+                UQualifiedReferenceExpression
+                    USimpleNameReferenceExpression (identifier = intRange)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
+                        UIdentifier (Identifier (contains))
+                        USimpleNameReferenceExpression (identifier = contains, resolvesTo = null)
+                        UBinaryExpressionWithType
+                            ULiteralExpression (value = 2)
+                            UTypeReferenceExpression (name = int)
+                UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))
+                    UIdentifier (Identifier (IntRange))
+                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: IntRange)
+                    ULiteralExpression (value = 1)
+                    ULiteralExpression (value = 2)
+        UMethod (name = barT)
+            UParameter (name = t)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UQualifiedReferenceExpression
+                    USimpleNameReferenceExpression (identifier = t)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (foo))
+                        USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
+        UMethod (name = barTL)
+            UParameter (name = listT)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+            UBlockExpression
+                UQualifiedReferenceExpression
+                    USimpleNameReferenceExpression (identifier = listT)
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                        UIdentifier (Identifier (isEmpty))
+                        USimpleNameReferenceExpression (identifier = isEmpty, resolvesTo = null)
+                UForEachExpression
+                    USimpleNameReferenceExpression (identifier = listT)
+                    UBlockExpression
+                        UQualifiedReferenceExpression
+                            USimpleNameReferenceExpression (identifier = a)
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
+                                UIdentifier (Identifier (foo))
+                                USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
+    UClass (name = A)
+        UMethod (name = foo)
+            UBlockExpression
+        UMethod (name = inlineFoo)
+            UBlockExpression
+        UMethod (name = A)
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fe10.txt
deleted file mode 100644
index cec0e5e89889..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fe10.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-public final class ResolveKt {
-    public static final fun bar() : void {
-        <init>().foo()
-        <init>().inlineFoo()
-        listOf(<init>()).forEach({ var it: A ->
-
-            println(it)
-        })
-        listOf("").joinToString()
-        listOf("").size
-        listOf("").indices
-        var date: java.util.Date = java.util.<init>()
-        date.time = 1000
-        listOf("").last()
-        mutableMapOf(1 <other> "1").entries.first().setValue("123")
-        var intRange: kotlin.ranges.LongRange = 0 .. 3
-        intRange.contains(2 as int)
-        <init>(1, 2)
-    }
-    public static final fun barT(@org.jetbrains.annotations.NotNull t: T) : void {
-        t.foo()
-    }
-    public static final fun barTL(@org.jetbrains.annotations.NotNull listT: T) : void {
-        listT.isEmpty()
-        for (a : listT) {
-            a.foo()
-        }
-    }
-}
-
-public class A {
-    public final fun foo() : void {
-    }
-    public final fun inlineFoo() : void {
-    }
-    public fun A() = UastEmptyExpression
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt
deleted file mode 100644
index cfdd0be64ef2..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-public final class ResolveKt {
-    public static final fun bar() : void {
-        <init>().foo()
-        <init>().inlineFoo()
-        listOf(<init>()).forEach({ var it: A ->
-
-            println(it)
-        })
-        listOf("").joinToString()
-        listOf("").size
-        listOf("").indices
-        var date: java.util.Date = java.util.<init>()
-        date.time = 1000
-        listOf("").last()
-        mutableMapOf(1 <other> "1").entries.first().setValue("123")
-        var intRange: kotlin.ranges.LongRange = 0 .. 3
-        intRange.contains(2 as int)
-        <init>(1, 2)
-    }
-    public static final fun barT(@org.jetbrains.annotations.NotNull t: T) : void {
-        t.foo()
-    }
-    public static final fun barTL(@org.jetbrains.annotations.NotNull listT: T) : void {
-        listT.isEmpty()
-        for (a : listT) {
-            a.foo()
-        }
-    }
-}
-
-public class A {
-    public final fun foo() : void {
-    }
-    public fun A() = UastEmptyExpression
-    public fun inlineFoo() : void {
-    }
-}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.txt
new file mode 100644
index 000000000000..8afeb53e73db
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.txt
@@ -0,0 +1,37 @@
+public final class ResolveKt {
+    public static final fun bar() : void {
+        <init>().foo()
+        <init>().inlineFoo()
+        listOf(<init>()).forEach({ var it: A ->
+
+            println(it)
+        })
+        listOf("").joinToString()
+        listOf("").size
+        listOf("").indices
+        var date: java.util.Date = java.util.<init>()
+        date.time = 1000
+        listOf("").last()
+        mutableMapOf(1 <other> "1").entries.first().setValue("123")
+        var intRange: kotlin.ranges.LongRange = 0 .. 3
+        intRange.contains(2 as int)
+        <init>(1, 2)
+    }
+    public static final fun barT(@org.jetbrains.annotations.NotNull t: T) : void {
+        t.foo()
+    }
+    public static final fun barTL(@org.jetbrains.annotations.NotNull listT: T) : void {
+        listT.isEmpty()
+        for (a : listT) {
+            a.foo()
+        }
+    }
+}
+
+public class A {
+    public final fun foo() : void {
+    }
+    public final fun inlineFoo() : void {
+    }
+    public fun A() = UastEmptyExpression
+}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fe10.txt
index 6f90dcc40c78..cc4499e96d1f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fe10.txt
@@ -1,29 +1,29 @@
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> null: null
     UIfExpression -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UIfExpression -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
     ULocalVariable (name = varae507364) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     ULocalVariable (name = varae507364) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UIfExpression -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> PsiMethod:isBlank: isBlank
-USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> PsiMethod:isBlank: isBlank
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> PsiMethod:isBlank: isBlank
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> Decompiled_Method: isBlank
+USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> Decompiled_Method: isBlank
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> Decompiled_Method: isBlank
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = str) -> Kotlin_Light_Value_Parameter: str
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:isBlank) -> USimpleNameReferenceExpression (identifier = isBlank) -> PsiMethod:isBlank: isBlank
-UBinaryExpression (operator = !=) -> UQualifiedReferenceExpression -> PsiMethod:isNotEmpty: isNotEmpty
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = isBlank) -> Decompiled_Method: isBlank
+UBinaryExpression (operator = !=) -> UQualifiedReferenceExpression -> Decompiled_Method: isNotEmpty
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = str) -> Kotlin_Light_Value_Parameter: str
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:isNotEmpty) -> USimpleNameReferenceExpression (identifier = isNotEmpty) -> PsiMethod:isNotEmpty: isNotEmpty
-UBinaryExpression (operator = !=) -> USimpleNameReferenceExpression (identifier = !=) -> PsiMethod:equals: equals
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = isNotEmpty) -> Decompiled_Method: isNotEmpty
+UBinaryExpression (operator = !=) -> USimpleNameReferenceExpression (identifier = !=) -> Decompiled_Method: equals
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fir.txt
index 51b07aef078b..ee9a3f5bd994 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedExpressions.resolved.fir.txt
@@ -1,25 +1,25 @@
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Variable: b
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> FUN: compareTo
     UIfExpression -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UIfExpression -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
     ULocalVariable (name = varae507364) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
     ULocalVariable (name = varae507364) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UIfExpression -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> null: null
 USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> null: null
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 USwitchClauseExpressionWithBody -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = str) -> Kotlin_Light_Value_Parameter: str
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = isBlank) -> FUN: isBlank
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.fe10.txt
deleted file mode 100644
index c511fed3334b..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.fe10.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-UTypeReferenceExpression (name = kotlin.annotation.Target) -> USimpleNameReferenceExpression (identifier = Target) -> PsiClass:Target: Target
-UNamedExpression (name = allowedTargets) -> UQualifiedReferenceExpression -> PsiField:TYPE: TYPE
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> PsiClass:AnnotationTarget: AnnotationTarget
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = TYPE) -> PsiField:TYPE: TYPE
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = kotlin.annotation.AnnotationTarget) -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> PsiClass:AnnotationTarget: AnnotationTarget
-UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:@Target(AnnotationTarget.TYPE)
-annotation class MyAnnotation(val a: Int, val b: String, val c: AnnotationTarget): MyAnnotation
-UNamedExpression (name = c) -> UQualifiedReferenceExpression -> PsiField:TYPE: TYPE
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> PsiClass:AnnotationTarget: AnnotationTarget
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = TYPE) -> PsiField:TYPE: TYPE
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UArrayAccessExpression -> USimpleNameReferenceExpression (identifier = list) -> Kotlin_Light_Value_Parameter: list
-    UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:@Target(AnnotationTarget.TYPE)
-annotation class MyAnnotation(val a: Int, val b: String, val c: AnnotationTarget): MyAnnotation
-    UNamedExpression (name = c) -> UQualifiedReferenceExpression -> PsiField:FILE: FILE
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> PsiClass:AnnotationTarget: AnnotationTarget
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = FILE) -> PsiField:FILE: FILE
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    ULocalVariable (name = c) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-    UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = UndefinedAnnotation) -> null: null
-    null -> USimpleNameReferenceExpression (identifier = unresolvedVar) -> null: null
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.txt
new file mode 100644
index 000000000000..21479638ad7c
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotatedTypes.resolved.txt
@@ -0,0 +1,25 @@
+UTypeReferenceExpression (name = kotlin.annotation.Target) -> USimpleNameReferenceExpression (identifier = Target) -> Decompiled_Class: Target
+UNamedExpression (name = allowedTargets) -> UQualifiedReferenceExpression -> Decompiled_Variable: TYPE
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> Decompiled_Class: AnnotationTarget
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = TYPE) -> Decompiled_Variable: TYPE
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = kotlin.annotation.AnnotationTarget) -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> Decompiled_Class: AnnotationTarget
+UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:@Target(AnnotationTarget.TYPE)
+annotation class MyAnnotation(val a: Int, val b: String, val c: AnnotationTarget): MyAnnotation
+UNamedExpression (name = c) -> UQualifiedReferenceExpression -> Decompiled_Variable: TYPE
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> Decompiled_Class: AnnotationTarget
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = TYPE) -> Decompiled_Variable: TYPE
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UArrayAccessExpression -> USimpleNameReferenceExpression (identifier = list) -> Kotlin_Light_Value_Parameter: list
+    UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:@Target(AnnotationTarget.TYPE)
+annotation class MyAnnotation(val a: Int, val b: String, val c: AnnotationTarget): MyAnnotation
+    UNamedExpression (name = c) -> UQualifiedReferenceExpression -> Decompiled_Variable: FILE
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = AnnotationTarget) -> Decompiled_Class: AnnotationTarget
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = FILE) -> Decompiled_Variable: FILE
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    ULocalVariable (name = c) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
+    UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = UndefinedAnnotation) -> null: null
+    null -> USimpleNameReferenceExpression (identifier = unresolvedVar) -> null: null
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fe10.txt
index 1567988cf98b..192208b9871c 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fe10.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = Annotation) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = Annotation) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = AnnotationArray) -> USimpleNameReferenceExpression (identifier = AnnotationArray) -> Kotlin_Light_Class:annotation class AnnotationArray(vararg val value: Annotation): AnnotationArray
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fir.txt
index f5bbe279ad43..efd98dc835c0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationComplex.resolved.fir.txt
@@ -1,17 +1,17 @@
-UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = Annotation) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = Annotation) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = AnnotationArray) -> USimpleNameReferenceExpression (identifier = AnnotationArray) -> Kotlin_Light_Class:annotation class AnnotationArray(vararg val value: Annotation): AnnotationArray
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = AnnotationArray) -> USimpleNameReferenceExpression (identifier = AnnotationArray) -> Kotlin_Light_Class:annotation class AnnotationArray(vararg val value: Annotation): AnnotationArray
 null -> USimpleNameReferenceExpression (identifier = value) -> Kotlin_Light_Method: value
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = Annotation[]) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 UTypeReferenceExpression (name = AnnotationArray) -> USimpleNameReferenceExpression (identifier = AnnotationArray) -> Kotlin_Light_Class:annotation class AnnotationArray(vararg val value: Annotation): AnnotationArray
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 null -> USimpleNameReferenceExpression (identifier = strings) -> Kotlin_Light_Method: strings
 UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> null: null
 UTypeReferenceExpression (name = AnnotationArray) -> USimpleNameReferenceExpression (identifier = AnnotationArray) -> Kotlin_Light_Class:annotation class AnnotationArray(vararg val value: Annotation): AnnotationArray
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Annotation) -> Kotlin_Light_Class:annotation class Annotation(vararg val strings: String): Annotation
 null -> USimpleNameReferenceExpression (identifier = strings) -> Kotlin_Light_Method: strings
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to null) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2)) -> null:
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2)) -> null:
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fe10.txt
index 1d7b49235960..474ccd34a007 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fe10.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
 UTypeReferenceExpression (name = int[]) -> USimpleNameReferenceExpression (identifier = IntArray) -> null: null
 UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = Array) -> null: null
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = RequiresPermission) -> USimpleNameReferenceExpression (identifier = RequiresPermission) -> Kotlin_Light_Class:annotation class RequiresPermission(val anyOf: IntArray): RequiresPermission
 null -> USimpleNameReferenceExpression (identifier = anyOf) -> Kotlin_Light_Method: anyOf
 UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = intArrayOf) -> null: null
@@ -13,15 +13,15 @@ null -> USimpleNameReferenceExpression (identifier = from) -> Kotlin_Light_Metho
 null -> USimpleNameReferenceExpression (identifier = to) -> Kotlin_Light_Method: to
 UTypeReferenceExpression (name = WithDefaultValue) -> USimpleNameReferenceExpression (identifier = WithDefaultValue) -> Kotlin_Light_Class:annotation class WithDefaultValue(val value: Int = 42): WithDefaultValue
 UTypeReferenceExpression (name = SuppressLint) -> USimpleNameReferenceExpression (identifier = SuppressLint) -> Kotlin_Light_Class:annotation class SuppressLint(vararg val value: String): SuppressLint
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = IntRange) -> USimpleNameReferenceExpression (identifier = IntRange) -> Kotlin_Light_Class:annotation class IntRange(val from: Long, val to: Long): IntRange
 UTypeReferenceExpression (name = SuppressLint) -> USimpleNameReferenceExpression (identifier = SuppressLint) -> Kotlin_Light_Class:annotation class SuppressLint(vararg val value: String): SuppressLint
-UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
+UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = RequiresPermission) -> USimpleNameReferenceExpression (identifier = RequiresPermission) -> Kotlin_Light_Class:annotation class RequiresPermission(val anyOf: IntArray): RequiresPermission
 null -> USimpleNameReferenceExpression (identifier = anyOf) -> Kotlin_Light_Method: anyOf
 UNamedExpression (name = anyOf) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) -> null:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = RequiresStrPermission) -> USimpleNameReferenceExpression (identifier = RequiresStrPermission) -> Kotlin_Light_Class:annotation class RequiresStrPermission(val strs: Array<String>): RequiresStrPermission
 null -> USimpleNameReferenceExpression (identifier = strs) -> Kotlin_Light_Method: strs
 UNamedExpression (name = strs) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) -> null:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fir.txt
index ef41cd0114b9..9748739cf4d0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/AnnotationParameters.resolved.fir.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
 UTypeReferenceExpression (name = int[]) -> USimpleNameReferenceExpression (identifier = IntArray) -> CLASS: IntArray
 UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = Array) -> CLASS: Array
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = RequiresPermission) -> USimpleNameReferenceExpression (identifier = RequiresPermission) -> Kotlin_Light_Class:annotation class RequiresPermission(val anyOf: IntArray): RequiresPermission
 null -> USimpleNameReferenceExpression (identifier = anyOf) -> Kotlin_Light_Method: anyOf
 UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = intArrayOf) -> null: null
@@ -13,15 +13,15 @@ null -> USimpleNameReferenceExpression (identifier = from) -> Kotlin_Light_Metho
 null -> USimpleNameReferenceExpression (identifier = to) -> Kotlin_Light_Method: to
 UTypeReferenceExpression (name = WithDefaultValue) -> USimpleNameReferenceExpression (identifier = WithDefaultValue) -> Kotlin_Light_Class:annotation class WithDefaultValue(val value: Int = 42): WithDefaultValue
 UTypeReferenceExpression (name = SuppressLint) -> USimpleNameReferenceExpression (identifier = SuppressLint) -> Kotlin_Light_Class:annotation class SuppressLint(vararg val value: String): SuppressLint
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = IntRange) -> USimpleNameReferenceExpression (identifier = IntRange) -> Kotlin_Light_Class:annotation class IntRange(val from: Long, val to: Long): IntRange
 UTypeReferenceExpression (name = SuppressLint) -> USimpleNameReferenceExpression (identifier = SuppressLint) -> Kotlin_Light_Class:annotation class SuppressLint(vararg val value: String): SuppressLint
-UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = RequiresPermission) -> USimpleNameReferenceExpression (identifier = RequiresPermission) -> Kotlin_Light_Class:annotation class RequiresPermission(val anyOf: IntArray): RequiresPermission
 null -> USimpleNameReferenceExpression (identifier = anyOf) -> Kotlin_Light_Method: anyOf
 UNamedExpression (name = anyOf) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) -> null:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = RequiresStrPermission) -> USimpleNameReferenceExpression (identifier = RequiresStrPermission) -> Kotlin_Light_Class:annotation class RequiresStrPermission(val strs: Array<String>): RequiresStrPermission
 null -> USimpleNameReferenceExpression (identifier = strs) -> Kotlin_Light_Method: strs
 UNamedExpression (name = strs) -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) -> null:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fe10.txt
index c97963212a4c..6a8dc40e29ed 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fe10.txt
@@ -1,28 +1,28 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Closeable: Closeable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Closeable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.io: io
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = io) -> PsiPackage:java.io: io
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Closeable) -> PsiClass:Closeable: Closeable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:InputStream: InputStream
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Closeable) -> Decompiled_Class: Closeable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: InputStream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.io: io
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = io) -> PsiPackage:java.io: io
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = InputStream) -> PsiClass:InputStream: InputStream
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = InputStream) -> Decompiled_Class: InputStream
     ULocalVariable (name = runnable) -> UObjectLiteralExpression -> null:
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: run
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = runnable) -> Kotlin_Light_Variable: runnable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = run) -> Kotlin_Light_Method: run
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:run: run
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: run
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = runnable2) -> Kotlin_Light_Variable: runnable2
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:run) -> USimpleNameReferenceExpression (identifier = run) -> PsiMethod:run: run
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = run) -> Decompiled_Method: run
     ULocalVariable (name = closeableRunnable) -> UObjectLiteralExpression -> null:
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-    UTypeReferenceExpression (name = java.io.Closeable) -> USimpleNameReferenceExpression (identifier = Closeable) -> PsiClass:Closeable: Closeable
-    ULocalVariable (name = runnableIs) -> UObjectLiteralExpression -> PsiMethod:InputStream:
-    UTypeReferenceExpression (name = java.io.InputStream) -> USimpleNameReferenceExpression (identifier = InputStream) -> PsiMethod:InputStream: InputStream
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+    UTypeReferenceExpression (name = java.io.Closeable) -> USimpleNameReferenceExpression (identifier = Closeable) -> Decompiled_Class: Closeable
+    ULocalVariable (name = runnableIs) -> UObjectLiteralExpression -> Decompiled_Method:
+    UTypeReferenceExpression (name = java.io.InputStream) -> USimpleNameReferenceExpression (identifier = InputStream) -> Decompiled_Method: InputStream
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     ULocalVariable (name = runnable) -> UObjectLiteralExpression -> null:
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fir.txt
index 087eb2495c85..f82ed3e533d7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Anonymous.resolved.fir.txt
@@ -1,28 +1,28 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Closeable: Closeable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Closeable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.io: io
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = io) -> PsiPackage:java.io: io
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Closeable) -> PsiClass:Closeable: Closeable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:InputStream: InputStream
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Closeable) -> Decompiled_Class: Closeable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: InputStream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.io: io
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = io) -> PsiPackage:java.io: io
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = InputStream) -> PsiClass:InputStream: InputStream
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = InputStream) -> Decompiled_Class: InputStream
     ULocalVariable (name = runnable) -> UObjectLiteralExpression -> null:
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = runnable) -> Kotlin_Light_Variable: runnable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = run) -> Kotlin_Light_Method: run
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = runnable2) -> Kotlin_Light_Variable: runnable2
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:run) -> USimpleNameReferenceExpression (identifier = run) -> PsiMethod:run: run
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = run) -> Decompiled_Method: run
     ULocalVariable (name = closeableRunnable) -> UObjectLiteralExpression -> null:
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-    UTypeReferenceExpression (name = java.io.Closeable) -> USimpleNameReferenceExpression (identifier = Closeable) -> PsiClass:Closeable: Closeable
-    ULocalVariable (name = runnableIs) -> UObjectLiteralExpression -> PsiMethod:InputStream:
-    UTypeReferenceExpression (name = java.io.InputStream) -> USimpleNameReferenceExpression (identifier = InputStream) -> PsiClass:InputStream: InputStream
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+    UTypeReferenceExpression (name = java.io.Closeable) -> USimpleNameReferenceExpression (identifier = Closeable) -> Decompiled_Class: Closeable
+    ULocalVariable (name = runnableIs) -> UObjectLiteralExpression -> Decompiled_Method:
+    UTypeReferenceExpression (name = java.io.InputStream) -> USimpleNameReferenceExpression (identifier = InputStream) -> Decompiled_Method: InputStream
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     ULocalVariable (name = runnable) -> UObjectLiteralExpression -> null:
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Assertion.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Assertion.resolved.txt
index ce4ad91e5fd6..999964633f9b 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Assertion.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Assertion.resolved.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Variable: s
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
\ No newline at end of file
+    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fe10.txt
index e189e2125ac1..791bb69378da 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fe10.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = and) -> null: null
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = mask) -> Kotlin_Light_Variable: mask
@@ -25,9 +25,9 @@ UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identif
     UBinaryExpression (operator = *) -> USimpleNameReferenceExpression (identifier = signed) -> Kotlin_Light_Variable: signed
     UBinaryExpression (operator = /) -> USimpleNameReferenceExpression (identifier = /) -> null: null
     UBinaryExpression (operator = /) -> USimpleNameReferenceExpression (identifier = one) -> Kotlin_Light_Variable: one
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = and) -> null: null
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = mask) -> Kotlin_Light_Variable: mask
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fir.txt
index 4e6371005e80..a7d2041d1ef5 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Bitwise.resolved.fir.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = and) -> FUN: and
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = mask) -> Kotlin_Light_Variable: mask
@@ -25,9 +25,9 @@ UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identif
     UBinaryExpression (operator = *) -> USimpleNameReferenceExpression (identifier = signed) -> Kotlin_Light_Variable: signed
     UBinaryExpression (operator = /) -> USimpleNameReferenceExpression (identifier = /) -> FUN: div
     UBinaryExpression (operator = /) -> USimpleNameReferenceExpression (identifier = one) -> Kotlin_Light_Variable: one
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+    UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = and) -> FUN: and
     UBinaryExpression (operator = &) -> USimpleNameReferenceExpression (identifier = mask) -> Kotlin_Light_Variable: mask
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.fe10.txt
deleted file mode 100644
index eb5049ab71b1..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.fe10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.txt
new file mode 100644
index 000000000000..0e1b5879e465
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenDataClass.resolved.txt
@@ -0,0 +1,5 @@
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fe10.txt
index 5f542f52325b..0dae23508c8a 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fe10.txt
@@ -1,7 +1,7 @@
 UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = Array) -> null: null
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
-    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
+    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Used) -> Kotlin_Light_Method: Used
     UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Method: doStuff1
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fir.txt
index 1d29bad97204..0f2b12037552 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/BrokenMethod.resolved.fir.txt
@@ -1,7 +1,7 @@
 UTypeReferenceExpression (name = java.lang.String[]) -> USimpleNameReferenceExpression (identifier = Array) -> CLASS: Array
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
-    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
+    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+    UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Used) -> Kotlin_Light_Method: Used
     UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> TYPE_REFERENCE: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ClassAnnotation.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ClassAnnotation.resolved.txt
index 8a7e794ccd5c..0261f167eb86 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ClassAnnotation.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ClassAnnotation.resolved.txt
@@ -1,6 +1,6 @@
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Test) -> null: null
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation(val text: String): MyAnnotation
 UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation(val text: String): MyAnnotation
 UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation(val text: String): MyAnnotation
 UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation(val text: String): MyAnnotation
-UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation(val text: String): MyAnnotation
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fe10.txt
index 19f35acd5ae4..f56e9e595da7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fe10.txt
@@ -1,18 +1,18 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> Decompiled_Method:
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = funPlainCall) -> Kotlin_Light_Method: funPlainCall
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = funNamedArgumentsCall) -> Kotlin_Light_Method: funNamedArgumentsCall
     null -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fir.txt
index ff06e8b79d14..eba4b6eb70fb 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/CommentOwners.resolved.fir.txt
@@ -1,18 +1,18 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> null:
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = funPlainCall) -> Kotlin_Light_Method: funPlainCall
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = funNamedArgumentsCall) -> Kotlin_Light_Method: funNamedArgumentsCall
     null -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fe10.txt
index f9b0cbc4d005..9497c3463715 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fe10.txt
@@ -1,6 +1,6 @@
 UComment -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> null: java
@@ -10,7 +10,7 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ja
 UComment -> USimpleNameReferenceExpression (identifier = ClassCastException) -> null: ClassCastException
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = ingredient) -> null: ingredient
@@ -20,7 +20,7 @@ UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Ingredient) -> Kotlin_Light_Class:/** Ingredient of [Pizza] */
     interface Ingredient: Ingredient
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = P) -> null: P
@@ -90,7 +90,7 @@ UTypeReferenceExpression (name = Pizza.Builder<P>) -> USimpleNameReferenceExpres
         protected abstract fun self(): P
     }: Builder
 UTypeReferenceExpression (name = P) -> USimpleNameReferenceExpression (identifier = P) -> Kotlin_Light_Type_Parameter: P
-UTypeReferenceExpression (name = java.util.Set<Pizza.Ingredient>) -> USimpleNameReferenceExpression (identifier = MutableSet) -> PsiClass:Set: Set
+UTypeReferenceExpression (name = java.util.Set<Pizza.Ingredient>) -> USimpleNameReferenceExpression (identifier = MutableSet) -> Decompiled_Class: Set
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Pizza) -> Kotlin_Light_Class:/**
  * Common Pizza Interface
  *
@@ -140,7 +140,7 @@ interface Pizza {
 }: Pizza
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Ingredient) -> Kotlin_Light_Class:/** Ingredient of [Pizza] */
     interface Ingredient: Ingredient
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:mutableSetOf) -> USimpleNameReferenceExpression (identifier = mutableSetOf) -> PsiMethod:mutableSetOf: mutableSetOf
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = mutableSetOf) -> Decompiled_Method: mutableSetOf
 UComment -> USimpleNameReferenceExpression (identifier = ingredient) -> null: ingredient
 UComment -> USimpleNameReferenceExpression (identifier = ingredients) -> null: ingredients
 UComment -> USimpleNameReferenceExpression (identifier = P) -> null: P
@@ -245,7 +245,7 @@ UTypeReferenceExpression (name = P) -> USimpleNameReferenceExpression (identifie
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = size) -> null: size
 UComment -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = Pizza) -> USimpleNameReferenceExpression (identifier = Pizza) -> Kotlin_Light_Class:/**
  * Common Pizza Interface
  *
@@ -295,12 +295,12 @@ interface Pizza {
 }: Pizza
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UReturnExpression -> UQualifiedReferenceExpression -> PsiMethod:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UReturnExpression -> UQualifiedReferenceExpression -> Decompiled_Method: String
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:String) -> USimpleNameReferenceExpression (identifier = String) -> PsiMethod:String: String
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Method: String
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = ingredient) -> null: ingredient
@@ -355,4 +355,4 @@ interface Pizza {
 }: Pizza
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Ingredient) -> Kotlin_Light_Class:/** Ingredient of [Pizza] */
     interface Ingredient: Ingredient
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fir.txt
index 95c8cdc5a345..03fe3cb8b9cf 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Comments.resolved.fir.txt
@@ -1,6 +1,6 @@
 UComment -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> null: java
@@ -10,7 +10,7 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ja
 UComment -> USimpleNameReferenceExpression (identifier = ClassCastException) -> null: ClassCastException
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = ingredient) -> null: ingredient
@@ -20,7 +20,7 @@ UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Ingredient) -> Kotlin_Light_Class:/** Ingredient of [Pizza] */
     interface Ingredient: Ingredient
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = P) -> null: P
@@ -90,7 +90,7 @@ UTypeReferenceExpression (name = Pizza.Builder<P>) -> USimpleNameReferenceExpres
         protected abstract fun self(): P
     }: Builder
 UTypeReferenceExpression (name = P) -> USimpleNameReferenceExpression (identifier = P) -> Kotlin_Light_Type_Parameter: P
-UTypeReferenceExpression (name = java.util.Set<Pizza.Ingredient>) -> USimpleNameReferenceExpression (identifier = MutableSet) -> PsiClass:Set: Set
+UTypeReferenceExpression (name = java.util.Set<Pizza.Ingredient>) -> USimpleNameReferenceExpression (identifier = MutableSet) -> Decompiled_Class: Set
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Pizza) -> Kotlin_Light_Class:/**
  * Common Pizza Interface
  *
@@ -245,7 +245,7 @@ UTypeReferenceExpression (name = P) -> USimpleNameReferenceExpression (identifie
 UComment -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = size) -> null: size
 UComment -> USimpleNameReferenceExpression (identifier = Margherita) -> null: Margherita
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = Pizza) -> USimpleNameReferenceExpression (identifier = Pizza) -> Kotlin_Light_Class:/**
  * Common Pizza Interface
  *
@@ -295,12 +295,12 @@ interface Pizza {
 }: Pizza
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UReturnExpression -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:String) -> USimpleNameReferenceExpression (identifier = String) -> PsiMethod:String: String
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Method: String
 UComment -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Pizza) -> null: Pizza
 UComment -> USimpleNameReferenceExpression (identifier = ingredient) -> null: ingredient
@@ -355,4 +355,4 @@ interface Pizza {
 }: Pizza
 UTypeReferenceExpression (name = Pizza.Ingredient) -> USimpleNameReferenceExpression (identifier = Ingredient) -> Kotlin_Light_Class:/** Ingredient of [Pizza] */
     interface Ingredient: Ingredient
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fe10.txt
deleted file mode 100644
index b3487237b925..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fe10.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:print) -> USimpleNameReferenceExpression (identifier = print) -> PsiMethod:print: print
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:print) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Value_Parameter: x
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = createBase) -> Kotlin_Light_Method: createBase
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = BaseImpl) -> Kotlin_Light_Method: BaseImpl
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fir.txt
deleted file mode 100644
index 66d61c65c5d8..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.fir.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = print) -> FUN: print
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Value_Parameter: x
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = createBase) -> Kotlin_Light_Method: createBase
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
-    fun print()
-}: Base
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = BaseImpl) -> Kotlin_Light_Method: BaseImpl
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.txt
new file mode 100644
index 000000000000..408710105d0e
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ConstructorDelegate.resolved.txt
@@ -0,0 +1,20 @@
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
+    fun print()
+}: Base
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = print) -> Decompiled_Method: print
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Value_Parameter: x
+UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
+    fun print()
+}: Base
+UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
+    fun print()
+}: Base
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = createBase) -> Kotlin_Light_Method: createBase
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = Base) -> USimpleNameReferenceExpression (identifier = Base) -> Kotlin_Light_Class:interface Base {
+    fun print()
+}: Base
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = BaseImpl) -> Kotlin_Light_Method: BaseImpl
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fe10.txt
index 5b1c498a3023..d5a8d5f5d5ed 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fe10.txt
@@ -1,62 +1,62 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> Decompiled_Method:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> Decompiled_Method:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> Decompiled_Method:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> PsiMethod:Object:
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> Decompiled_Method:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     ULocalVariable (name = local) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: toString
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = local) -> Kotlin_Light_Variable: local
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:toString) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fir.txt
index 0e83c31b239c..afac975e618d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Constructors.resolved.fir.txt
@@ -1,60 +1,60 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> null:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getA
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> null:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> null:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getA
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> null:
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: setA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getA
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     ULocalVariable (name = local) -> USimpleNameReferenceExpression (identifier = s) -> Kotlin_Light_Value_Parameter: s
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = local) -> Kotlin_Light_Variable: local
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Variable: a
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getA
     UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DataClassInheritsAbstractClassWithEquals.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DataClassInheritsAbstractClassWithEquals.resolved.txt
index f199cd60793f..7dfb68a45331 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DataClassInheritsAbstractClassWithEquals.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DataClassInheritsAbstractClassWithEquals.resolved.txt
@@ -1,24 +1,24 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = AbstractBaseWithAbstractEquals) -> USimpleNameReferenceExpression (identifier = AbstractBaseWithAbstractEquals) -> Kotlin_Light_Class:abstract class AbstractBaseWithAbstractEquals {
     abstract override fun equals(other: Any?): Boolean
 }: AbstractBaseWithAbstractEquals
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = AbstractBaseWithImplementedEquals) -> USimpleNameReferenceExpression (identifier = AbstractBaseWithImplementedEquals) -> Kotlin_Light_Class:abstract class AbstractBaseWithImplementedEquals {
     override fun equals(other: Any?): Boolean = true
 }: AbstractBaseWithImplementedEquals
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = AbstractBaseWithFinalEquals) -> USimpleNameReferenceExpression (identifier = AbstractBaseWithFinalEquals) -> Kotlin_Light_Class:abstract class AbstractBaseWithFinalEquals {
     final override fun equals(other: Any?): Boolean = true
 }: AbstractBaseWithFinalEquals
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = AbstractBaseWithNoEquals) -> USimpleNameReferenceExpression (identifier = AbstractBaseWithNoEquals) -> Kotlin_Light_Class:abstract class AbstractBaseWithNoEquals: AbstractBaseWithNoEquals
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = AbstractBaseWithNoEquals) -> USimpleNameReferenceExpression (identifier = AbstractBaseWithNoEquals) -> Kotlin_Light_Class:abstract class AbstractBaseWithNoEquals: AbstractBaseWithNoEquals
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
\ No newline at end of file
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DefaultParameterValues.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DefaultParameterValues.resolved.txt
index 9eae50d57b1c..167d3a2d69f5 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DefaultParameterValues.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DefaultParameterValues.resolved.txt
@@ -1,2 +1,2 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
\ No newline at end of file
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fe10.txt
index 7c6c6255bbce..9a8f6b284271 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fe10.txt
@@ -1,8 +1,8 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:lazy) -> USimpleNameReferenceExpression (identifier = lazy) -> PsiMethod:lazy: lazy
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lazy) -> Decompiled_Method: lazy
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = MyColor) -> Kotlin_Light_Method: MyColor
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:lazy) -> USimpleNameReferenceExpression (identifier = lazy) -> PsiMethod:lazy: lazy
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lazy) -> Decompiled_Method: lazy
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = MyColor) -> Kotlin_Light_Method: MyColor
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = MyColor) -> Kotlin_Light_Method: MyColor
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fir.txt
index 4c18749cf4a5..fbee7b2e2a2a 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Delegate.resolved.fir.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lazy) -> FUN: lazy
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = MyColor) -> Kotlin_Light_Method: MyColor
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lazy) -> FUN: lazy
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fe10.txt
index adcb1294c890..8d04e6bc1142 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fe10.txt
@@ -1,9 +1,9 @@
 null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
-UTypeReferenceExpression (name = kotlin.Deprecated) -> USimpleNameReferenceExpression (identifier = Deprecated) -> PsiClass:Deprecated: Deprecated
-null -> USimpleNameReferenceExpression (identifier = level) -> PsiMethod:level: level
-UNamedExpression (name = level) -> UQualifiedReferenceExpression -> PsiField:HIDDEN: HIDDEN
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = DeprecationLevel) -> PsiClass:DeprecationLevel: DeprecationLevel
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = HIDDEN) -> PsiField:HIDDEN: HIDDEN
-null -> USimpleNameReferenceExpression (identifier = message) -> PsiMethod:message: message
+UTypeReferenceExpression (name = kotlin.Deprecated) -> USimpleNameReferenceExpression (identifier = Deprecated) -> Decompiled_Class: Deprecated
+null -> USimpleNameReferenceExpression (identifier = level) -> Decompiled_Method: level
+UNamedExpression (name = level) -> UQualifiedReferenceExpression -> Decompiled_Variable: HIDDEN
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = DeprecationLevel) -> Decompiled_Class: DeprecationLevel
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = HIDDEN) -> Decompiled_Variable: HIDDEN
+null -> USimpleNameReferenceExpression (identifier = message) -> Decompiled_Method: message
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fir.txt
index 66d7e00b9d2e..781f22453095 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DeprecatedHidden.resolved.fir.txt
@@ -1,9 +1,9 @@
 null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
-UTypeReferenceExpression (name = kotlin.Deprecated) -> USimpleNameReferenceExpression (identifier = Deprecated) -> PRIMARY_CONSTRUCTOR: Deprecated
+UTypeReferenceExpression (name = kotlin.Deprecated) -> USimpleNameReferenceExpression (identifier = Deprecated) -> Decompiled_Class: Deprecated
 null -> USimpleNameReferenceExpression (identifier = level) -> null: null
-UNamedExpression (name = level) -> UQualifiedReferenceExpression -> CLASS: HIDDEN
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = DeprecationLevel) -> CLASS: DeprecationLevel
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = HIDDEN) -> CLASS: HIDDEN
+UNamedExpression (name = level) -> UQualifiedReferenceExpression -> Decompiled_Variable: HIDDEN
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = DeprecationLevel) -> Decompiled_Class: DeprecationLevel
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = HIDDEN) -> Decompiled_Variable: HIDDEN
 null -> USimpleNameReferenceExpression (identifier = message) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fe10.txt
deleted file mode 100644
index 093df40a334d..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fe10.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> PsiMethod:to: to
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = data) -> Kotlin_Light_Value_Parameter: data
-    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
-    UTypeReferenceExpression (name = kotlin.Pair<? extends java.lang.String,? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = Pair) -> PsiClass:Pair: Pair
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fir.txt
deleted file mode 100644
index b1256dcf3f99..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.fir.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> FUN: to
-    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
-    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = data) -> Kotlin_Light_Value_Parameter: data
-    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
-    UTypeReferenceExpression (name = kotlin.Pair<? extends java.lang.String,? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = Pair) -> CLASS: Pair
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.txt
new file mode 100644
index 000000000000..5ddc8fe003c7
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/DestructuringDeclaration.resolved.txt
@@ -0,0 +1,8 @@
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> Decompiled_Method: to
+    UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = data) -> Kotlin_Light_Value_Parameter: data
+    UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
+    UTypeReferenceExpression (name = kotlin.Pair<? extends java.lang.String,? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = Pair) -> Decompiled_Class: Pair
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fe10.txt
index 4b280c28d17f..38ea9ab38511 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fe10.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
-    UIfExpression -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UIfExpression -> UQualifiedReferenceExpression -> Decompiled_Method: toString
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fir.txt
index 202348230fdf..b37414920a72 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Elvis.resolved.fir.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ElvisType.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ElvisType.resolved.txt
index 9ba8ac52ba1a..56790d0914f6 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ElvisType.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ElvisType.resolved.txt
@@ -1,5 +1,5 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
 ULocalVariable (name = var63c495f9) -> USimpleNameReferenceExpression (identifier = text) -> Kotlin_Light_Value_Parameter: text
 UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
\ No newline at end of file
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValueMembers.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValueMembers.resolved.txt
index 0686d557d18e..498ed5433c7e 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValueMembers.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValueMembers.resolved.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
\ No newline at end of file
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValuesConstructors.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValuesConstructors.resolved.txt
index f8e1a1f61c7d..45b294547e87 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValuesConstructors.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/EnumValuesConstructors.resolved.txt
@@ -1,5 +1,5 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
 UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
 UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
 UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
-UTypeReferenceExpression (name = Style) -> USimpleNameReferenceExpression (identifier = Style) -> Kotlin_Light_Method: Style
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/IfStatement.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/IfStatement.resolved.fe10.txt
index e8e0186f6ae5..acf3d7b79e47 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/IfStatement.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/IfStatement.resolved.fe10.txt
@@ -1 +1 @@
-UBinaryExpression (operator = !=) -> USimpleNameReferenceExpression (identifier = !=) -> PsiMethod:equals: equals
+UBinaryExpression (operator = !=) -> USimpleNameReferenceExpression (identifier = !=) -> Decompiled_Method: equals
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fe10.txt
index c286609a63a2..7081c65d0458 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fe10.txt
@@ -1,40 +1,40 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiMethod:currentThread: currentThread
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Method: currentThread
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = currentThread) -> PsiMethod:currentThread: currentThread
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiField:NORM_PRIORITY: NORM_PRIORITY
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = currentThread) -> Decompiled_Method: currentThread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Variable: NORM_PRIORITY
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = NORM_PRIORITY) -> PsiField:NORM_PRIORITY: NORM_PRIORITY
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:UncaughtExceptionHandler: UncaughtExceptionHandler
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = NORM_PRIORITY) -> Decompiled_Variable: NORM_PRIORITY
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: UncaughtExceptionHandler
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = UncaughtExceptionHandler) -> PsiClass:UncaughtExceptionHandler: UncaughtExceptionHandler
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = UncaughtExceptionHandler) -> Decompiled_Class: UncaughtExceptionHandler
 UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> null: null
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = sleep) -> null: null
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiMethod:emptyList: emptyList
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Method: emptyList
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:kotlin.collections: collections
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = collections) -> PsiPackage:kotlin.collections: collections
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = emptyList) -> PsiMethod:emptyList: emptyList
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiField:SIZE_BYTES: SIZE_BYTES
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:IntCompanionObject: IntCompanionObject
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Integer: Integer
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = emptyList) -> Decompiled_Method: emptyList
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Variable: SIZE_BYTES
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: IntCompanionObject
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Integer
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Companion) -> PsiClass:IntCompanionObject: IntCompanionObject
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) -> PsiField:SIZE_BYTES: SIZE_BYTES
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Companion) -> Decompiled_Class: IntCompanionObject
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) -> Decompiled_Variable: SIZE_BYTES
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fir.txt
index fde668058d83..00e700eb6c0d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Imports.resolved.fir.txt
@@ -1,30 +1,30 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiMethod:currentThread: currentThread
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Method: currentThread
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = currentThread) -> PsiMethod:currentThread: currentThread
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiField:NORM_PRIORITY: NORM_PRIORITY
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = currentThread) -> Decompiled_Method: currentThread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Variable: NORM_PRIORITY
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = NORM_PRIORITY) -> PsiField:NORM_PRIORITY: NORM_PRIORITY
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:UncaughtExceptionHandler: UncaughtExceptionHandler
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = NORM_PRIORITY) -> Decompiled_Variable: NORM_PRIORITY
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: UncaughtExceptionHandler
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = UncaughtExceptionHandler) -> PsiClass:UncaughtExceptionHandler: UncaughtExceptionHandler
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = UncaughtExceptionHandler) -> Decompiled_Class: UncaughtExceptionHandler
 UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> null: null
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = sleep) -> null: null
 UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> FUN: emptyList
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:kotlin.collections: collections
@@ -32,9 +32,9 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ko
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = collections) -> PsiPackage:kotlin.collections: collections
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = emptyList) -> FUN: emptyList
 UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PROPERTY: SIZE_BYTES
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> OBJECT_DECLARATION: Companion
-UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Integer: Integer
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: IntCompanionObject
+UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Integer
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Companion) -> OBJECT_DECLARATION: Companion
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Companion) -> Decompiled_Class: IntCompanionObject
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) -> PROPERTY: SIZE_BYTES
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fe10.txt
index 1ef3e8572144..c96439c06e34 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fe10.txt
@@ -1,8 +1,8 @@
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
     UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
-    UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = in) -> PsiMethod:contains: contains
+    UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = in) -> Decompiled_Method: contains
     UBinaryExpression (operator = ..) -> USimpleNameReferenceExpression (identifier = ..) -> null: null
     UBinaryExpression (operator = &&) -> USimpleNameReferenceExpression (identifier = &&) -> null: null
     UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = y) -> Kotlin_Light_Variable: y
-    UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = !in) -> PsiMethod:contains: contains
+    UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = !in) -> Decompiled_Method: contains
     UBinaryExpression (operator = ..) -> USimpleNameReferenceExpression (identifier = ..) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fir.txt
index c781160ec7bc..33fa840904d5 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/In.resolved.fir.txt
@@ -1,8 +1,8 @@
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
     UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Variable: x
-    UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = in) -> FUN: contains
+    UBinaryExpression (operator = in) -> USimpleNameReferenceExpression (identifier = in) -> Decompiled_Method: contains
     UBinaryExpression (operator = ..) -> USimpleNameReferenceExpression (identifier = ..) -> FUN: rangeTo
     UBinaryExpression (operator = &&) -> USimpleNameReferenceExpression (identifier = &&) -> null: null
     UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = y) -> Kotlin_Light_Variable: y
-    UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = !in) -> FUN: contains
+    UBinaryExpression (operator = !in) -> USimpleNameReferenceExpression (identifier = !in) -> Decompiled_Method: contains
     UBinaryExpression (operator = ..) -> USimpleNameReferenceExpression (identifier = ..) -> FUN: rangeTo
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InferenceInsideUnresolvedConstructor.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InferenceInsideUnresolvedConstructor.resolved.txt
index 480533bea93e..8bcf1fda7758 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InferenceInsideUnresolvedConstructor.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InferenceInsideUnresolvedConstructor.resolved.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Unresolved) -> null: null
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = id) -> Kotlin_Light_Method: id
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UReturnExpression -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Value_Parameter: x
\ No newline at end of file
+UReturnExpression -> USimpleNameReferenceExpression (identifier = x) -> Kotlin_Light_Value_Parameter: x
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fe10.txt
index a02b61aa5060..d93b4f6cbb06 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fe10.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
-UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
+UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fir.txt
index d83be4654d2d..0bf4801a985f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerClasses.resolved.fir.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
 UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
-UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UReturnExpression -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fe10.txt
index 7403e9721243..dbe90c39fdb9 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fe10.txt
@@ -1,11 +1,11 @@
 UTypeReferenceExpression (name = Some<T>) -> USimpleNameReferenceExpression (identifier = Some) -> Kotlin_Light_Class:class Some<T : Some<T>>: Some
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.util.List<? extends java.lang.Object>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.util.List<? extends java.lang.Object>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: filterIsInstance
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = list) -> Kotlin_Light_Value_Parameter: list
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = filterIsInstance) -> Kotlin_Light_Method: filterIsInstance
     UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Some) -> Kotlin_Light_Class:class Some<T : Some<T>>: Some
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = mapTo) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:mutableSetOf) -> USimpleNameReferenceExpression (identifier = mutableSetOf) -> PsiMethod:mutableSetOf: mutableSetOf
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = mutableSetOf) -> Decompiled_Method: mutableSetOf
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fir.txt
index ab122259638e..acf27d1022a2 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/InnerNonFixedTypeVariable.resolved.fir.txt
@@ -1,7 +1,7 @@
 UTypeReferenceExpression (name = Some<T>) -> USimpleNameReferenceExpression (identifier = Some) -> Kotlin_Light_Class:class Some<T : Some<T>>: Some
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.util.List<? extends java.lang.Object>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.util.List<? extends java.lang.Object>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = list) -> Kotlin_Light_Value_Parameter: list
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaExpressionFunctionalInterfaceType.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaExpressionFunctionalInterfaceType.resolved.fe10.txt
index 273e7642c41d..1f570a11e3cb 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaExpressionFunctionalInterfaceType.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaExpressionFunctionalInterfaceType.resolved.fe10.txt
@@ -1,14 +1,14 @@
-UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:map: map
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiMethod:of: of
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:Stream: Stream
+UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: map
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Method: of
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: Stream
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.stream: stream
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = stream) -> PsiPackage:java.util.stream: stream
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> PsiClass:Stream: Stream
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:of) -> USimpleNameReferenceExpression (identifier = of) -> PsiMethod:of: of
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:map) -> USimpleNameReferenceExpression (identifier = map) -> PsiMethod:map: map
-        UReturnExpression -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> Decompiled_Class: Stream
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = of) -> Decompiled_Method: of
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = map) -> Decompiled_Method: map
+        UReturnExpression -> UQualifiedReferenceExpression -> Decompiled_Method: toString
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> null: null
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fe10.txt
index 8f9c31507472..4fe5f06f0509 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fe10.txt
@@ -1,5 +1,5 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:buildString) -> USimpleNameReferenceExpression (identifier = buildString) -> PsiMethod:buildString: buildString
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:append) -> USimpleNameReferenceExpression (identifier = append) -> PsiMethod:append: append
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:let: let
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:let) -> USimpleNameReferenceExpression (identifier = let) -> PsiMethod:let: let
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = buildString) -> Decompiled_Method: buildString
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = append) -> Decompiled_Method: append
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: let
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = let) -> Decompiled_Method: let
         UReturnExpression -> USimpleNameReferenceExpression (identifier = it) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fir.txt
index 3dd5807070f6..7403118f7cf4 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaParameters.resolved.fir.txt
@@ -1,5 +1,5 @@
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = buildString) -> FUN: buildString
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:append) -> USimpleNameReferenceExpression (identifier = append) -> PsiMethod:append: append
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = append) -> Decompiled_Method: append
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = let) -> FUN: let
         UReturnExpression -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fe10.txt
index 5c10c43e23e6..2c21ced98ae8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fe10.txt
@@ -5,11 +5,11 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = or
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = jetbrains) -> PsiPackage:org.jetbrains: jetbrains
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = uast) -> PsiPackage:org.jetbrains.uast: uast
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:org.jetbrains.uast.kotlin: kotlin
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
@@ -19,18 +19,18 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ko
         UBinaryExpression (operator = -) -> USimpleNameReferenceExpression (identifier = -) -> null: null
         UBinaryExpression (operator = -) -> USimpleNameReferenceExpression (identifier = c) -> Kotlin_Light_Variable: c
     ULabeledExpression (label = lbd) -> USimpleNameReferenceExpression (identifier = lbd) -> null: null
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UReturnExpression -> USimpleNameReferenceExpression (identifier = lbd) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = d) -> Kotlin_Light_Variable: d
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
         UBinaryExpression (operator = <) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = <) -> USimpleNameReferenceExpression (identifier = <) -> null: null
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> null: null
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> Kotlin_Light_Method: plus
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
@@ -39,10 +39,10 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ko
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = it) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lmbd) -> Kotlin_Light_Value_Parameter: lmbd
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fir.txt
index 81b83e153554..a6163770c49a 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LambdaReturn.resolved.fir.txt
@@ -5,11 +5,11 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = or
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = jetbrains) -> PsiPackage:org.jetbrains: jetbrains
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = uast) -> PsiPackage:org.jetbrains.uast: uast
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:org.jetbrains.uast.kotlin: kotlin
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> FUN: compareTo
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
@@ -19,30 +19,30 @@ UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = ko
         UBinaryExpression (operator = -) -> USimpleNameReferenceExpression (identifier = -) -> FUN: minus
         UBinaryExpression (operator = -) -> USimpleNameReferenceExpression (identifier = c) -> Kotlin_Light_Variable: c
     ULabeledExpression (label = lbd) -> USimpleNameReferenceExpression (identifier = lbd) -> null: null
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
         UReturnExpression -> USimpleNameReferenceExpression (identifier = lbd) -> FUNCTION_LITERAL: <anonymous>
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = d) -> Kotlin_Light_Variable: d
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
         UBinaryExpression (operator = <) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = <) -> USimpleNameReferenceExpression (identifier = <) -> FUN: compareTo
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> FUN: compareTo
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
         UBinaryExpression (operator = >) -> USimpleNameReferenceExpression (identifier = >) -> FUN: compareTo
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
         UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Variable: b
-    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
-    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+    UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lmbd) -> Kotlin_Light_Value_Parameter: lmbd
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lmbd) -> Kotlin_Light_Value_Parameter: lmbd
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fe10.txt
index dc18c1b91de2..3e42c4daaed7 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fe10.txt
@@ -1,20 +1,20 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Stream: Stream
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Stream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.stream: stream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = stream) -> PsiPackage:java.util.stream: stream
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> PsiClass:Stream: Stream
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:filter: filter
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiMethod:empty: empty
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> PsiClass:Stream: Stream
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:empty) -> USimpleNameReferenceExpression (identifier = empty) -> PsiMethod:empty: empty
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:filter) -> USimpleNameReferenceExpression (identifier = filter) -> PsiMethod:filter: filter
-        UReturnExpression -> UQualifiedReferenceExpression -> PsiMethod:isEmpty: isEmpty
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> Decompiled_Class: Stream
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: filter
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Method: empty
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> Decompiled_Class: Stream
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = empty) -> Decompiled_Method: empty
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = filter) -> Decompiled_Method: filter
+        UReturnExpression -> UQualifiedReferenceExpression -> Decompiled_Method: isEmpty
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> null: null
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:isEmpty) -> USimpleNameReferenceExpression (identifier = isEmpty) -> PsiMethod:isEmpty: isEmpty
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = isEmpty) -> Decompiled_Method: isEmpty
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = selectItemFunction) -> Kotlin_Light_Value_Parameter: selectItemFunction
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Local) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> Kotlin_Light_Variable: baz
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fir.txt
index a19f5a923ee2..e1963a9d1d8d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Lambdas.resolved.fir.txt
@@ -1,21 +1,21 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Stream: Stream
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Stream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.stream: stream
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = stream) -> PsiPackage:java.util.stream: stream
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> PsiClass:Stream: Stream
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> Decompiled_Class: Stream
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> PsiClass:Stream: Stream
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:empty) -> USimpleNameReferenceExpression (identifier = empty) -> PsiMethod:empty: empty
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Stream) -> Decompiled_Class: Stream
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = empty) -> Decompiled_Method: empty
     UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:filter) -> USimpleNameReferenceExpression (identifier = filter) -> PsiMethod:filter: filter
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = filter) -> Decompiled_Method: filter
         UReturnExpression -> UQualifiedReferenceExpression -> null: null
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = isEmpty) -> FUN: isEmpty
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = selectItemFunction) -> Kotlin_Light_Value_Parameter: selectItemFunction
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = selectItemFunction) -> Kotlin_Light_Value_Parameter: selectItemFunction
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Local) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> Kotlin_Light_Variable: baz
-    UWhileExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> null:
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> Kotlin_Light_Variable: baz
+    UWhileExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Decompiled_Method:
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fe10.txt
index 07bced5b18b1..aaf62ff9e9f3 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fe10.txt
@@ -1,8 +1,8 @@
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
         UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Variable: bar
-    UBinaryExpression (operator = ==) -> USimpleNameReferenceExpression (identifier = ==) -> PsiMethod:equals: equals
+    UBinaryExpression (operator = ==) -> USimpleNameReferenceExpression (identifier = ==) -> Decompiled_Method: equals
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fir.txt
index 96fb2b71c84c..583c02cc29fd 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/LocalDeclarations.resolved.fir.txt
@@ -1,8 +1,8 @@
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
-        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Variable: bar
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
+        UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Variable: bar
     UBinaryExpression (operator = ==) -> USimpleNameReferenceExpression (identifier = ==) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Local) -> Kotlin_Light_Class:class Local: Local
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ManyAlternatives.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ManyAlternatives.resolved.txt
index 5819bd714416..cf5bfa602d46 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ManyAlternatives.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ManyAlternatives.resolved.txt
@@ -1,3 +1,3 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
\ No newline at end of file
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NameContainingFile.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NameContainingFile.resolved.txt
index f6d561f6e6e0..2c8f65978bed 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NameContainingFile.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NameContainingFile.resolved.txt
@@ -1 +1 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
\ No newline at end of file
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fe10.txt
deleted file mode 100644
index 67c63cb8acc7..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fe10.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-    UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) -> Kotlin_Light_Method:
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = p) -> Kotlin_Light_Variable: p
-            UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fir.txt
deleted file mode 100644
index b77b3b7a0803..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.fir.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-    UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
-    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) -> Kotlin_Light_Method:
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = p) -> Kotlin_Light_Variable: p
-            UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
-
-    operator fun invoke(){
-        this()
-    }
-
-    operator fun invoke(f: ()-> Unit){
-
-    }
-
-}: A
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.txt
new file mode 100644
index 000000000000..e45388789d9b
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/NonTrivialIdentifiers.resolved.txt
@@ -0,0 +1,54 @@
+UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
+    UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Class:class A {
+
+    operator fun invoke(){
+        this()
+    }
+
+    operator fun invoke(f: ()-> Unit){
+
+    }
+
+}: A
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
+
+    operator fun invoke(){
+        this()
+    }
+
+    operator fun invoke(f: ()-> Unit){
+
+    }
+
+}: A
+    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
+    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
+    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
+
+    operator fun invoke(){
+        this()
+    }
+
+    operator fun invoke(f: ()-> Unit){
+
+    }
+
+}: A
+    UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) -> Kotlin_Light_Method:
+    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
+    UPostfixExpression (operator = !!) -> USimpleNameReferenceExpression (identifier = !!) -> null: null
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = p) -> Kotlin_Light_Variable: p
+            UBlockExpression -> UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) -> Kotlin_Light_Method:
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
+
+    operator fun invoke(){
+        this()
+    }
+
+    operator fun invoke(f: ()-> Unit){
+
+    }
+
+}: A
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParameterPropertyWithAnnotation.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParameterPropertyWithAnnotation.resolved.txt
index 0400e63e51f1..0f7b8aac5038 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParameterPropertyWithAnnotation.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParameterPropertyWithAnnotation.resolved.txt
@@ -1,8 +1,8 @@
 UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation: MyAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = MyAnnotation) -> USimpleNameReferenceExpression (identifier = MyAnnotation) -> Kotlin_Light_Class:annotation class MyAnnotation: MyAnnotation
 UTypeReferenceExpression (name = MyAnnotation2) -> USimpleNameReferenceExpression (identifier = MyAnnotation2) -> Kotlin_Light_Class:annotation class MyAnnotation2: MyAnnotation2
 UTypeReferenceExpression (name = MyAnnotation3) -> USimpleNameReferenceExpression (identifier = MyAnnotation3) -> Kotlin_Light_Class:annotation class MyAnnotation3: MyAnnotation3
 UTypeReferenceExpression (name = MyAnnotation4) -> USimpleNameReferenceExpression (identifier = MyAnnotation4) -> Kotlin_Light_Class:annotation class MyAnnotation4: MyAnnotation4
 UTypeReferenceExpression (name = MyAnnotation5) -> USimpleNameReferenceExpression (identifier = MyAnnotation5) -> Kotlin_Light_Class:annotation class MyAnnotation5: MyAnnotation5
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
\ No newline at end of file
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fe10.txt
index d61bf59df68b..9be3ed43aef5 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fe10.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = global) -> Kotlin_Light_Method: global
     null -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
     null -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
@@ -12,46 +12,46 @@ UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (ident
     null -> USimpleNameReferenceExpression (identifier = d) -> Kotlin_Light_Value_Parameter: d
     UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: withReceiver
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = withReceiver) -> Kotlin_Light_Method: withReceiver
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:atan2: atan2
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Math) -> PsiClass:Math: Math
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:atan2) -> USimpleNameReferenceExpression (identifier = atan2) -> PsiMethod:atan2: atan2
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: atan2
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Math) -> Decompiled_Class: Math
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = atan2) -> Decompiled_Method: atan2
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = unresolvedMethod) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:format: format
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: format
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:format: format
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: format
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:format: format
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: format
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:format: format
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: format
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> UQualifiedReferenceExpression -> Kotlin_Light_Method: toTypedArray
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiMethod:chunked: chunked
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:chunked) -> USimpleNameReferenceExpression (identifier = chunked) -> PsiMethod:chunked: chunked
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> UQualifiedReferenceExpression -> Kotlin_Light_Method: toTypedArray
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Method: chunked
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = chunked) -> Decompiled_Method: chunked
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = toTypedArray) -> Kotlin_Light_Method: toTypedArray
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:with) -> USimpleNameReferenceExpression (identifier = with) -> PsiMethod:with: with
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = with) -> Decompiled_Method: with
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
 
     fun String.with2Receivers(a: Int, b: Float) {}
@@ -59,11 +59,11 @@ UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (ident
 }: A
         UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: with2Receivers
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = with2Receivers) -> Kotlin_Light_Method: with2Receivers
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBlockExpression -> UObjectLiteralExpression -> Kotlin_Light_Method:
     UTypeReferenceExpression (name = Parent) -> USimpleNameReferenceExpression (identifier = Parent) -> Kotlin_Light_Method: Parent
     null -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fir.txt
index 4221ca1acace..ce796e87a03a 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersDisorder.resolved.fir.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = global) -> Kotlin_Light_Method: global
     null -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
     null -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
@@ -13,58 +13,58 @@ UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (ident
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = withReceiver) -> Kotlin_Light_Method: withReceiver
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Math) -> PsiClass:Math: Math
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:atan2) -> USimpleNameReferenceExpression (identifier = atan2) -> PsiMethod:atan2: atan2
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Math) -> Decompiled_Class: Math
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = atan2) -> Decompiled_Method: atan2
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = unresolvedMethod) -> null: null
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> FUN: arrayOf
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> FUN: arrayOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))(resolves to null) -> USimpleNameReferenceExpression (identifier = arrayOf) -> FUN: arrayOf
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiClass:String: String
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Class: String
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> USimpleNameReferenceExpression (identifier = format) -> PsiMethod:format: format
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:format) -> UQualifiedReferenceExpression -> null: null
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = format) -> Decompiled_Method: format
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = chunked) -> FUN: chunked
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toTypedArray) -> FUN: toTypedArray
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = with) -> FUN: with
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A {
 
     fun String.with2Receivers(a: Int, b: Float) {}
 
 }: A
         UBlockExpression -> UQualifiedReferenceExpression -> null: null
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = with2Receivers) -> Kotlin_Light_Method: with2Receivers
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> PsiClass:Float: Float
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = float) -> USimpleNameReferenceExpression (identifier = Float) -> Decompiled_Class: Float
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBlockExpression -> UObjectLiteralExpression -> Kotlin_Light_Method:
-    UTypeReferenceExpression (name = Parent) -> USimpleNameReferenceExpression (identifier = Parent) -> Kotlin_Light_Class:open class Parent(a: String, b: Int): Parent
+    UTypeReferenceExpression (name = Parent) -> USimpleNameReferenceExpression (identifier = Parent) -> Kotlin_Light_Method: Parent
     null -> USimpleNameReferenceExpression (identifier = b) -> Kotlin_Light_Value_Parameter: b
     null -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersWithDefaultValues.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersWithDefaultValues.resolved.txt
index c151e7811d43..ea7734c381c2 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersWithDefaultValues.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ParametersWithDefaultValues.resolved.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> PsiClass:Boolean: Boolean
\ No newline at end of file
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = boolean) -> USimpleNameReferenceExpression (identifier = Boolean) -> Decompiled_Class: Boolean
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fe10.txt
index bb77dca302d6..310ab46c410d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fe10.txt
@@ -1,5 +1,5 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UReturnExpression -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UReturnExpression -> UQualifiedReferenceExpression -> Decompiled_Method: toString
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Class:class PropertyTest {
     var stringRepresentation: String
         get() = this.toString()
@@ -11,7 +11,7 @@ UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = t
 
     }
 }: PropertyTest
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = setDataFromString) -> Kotlin_Light_Method: setDataFromString
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = value) -> Kotlin_Light_Value_Parameter: value
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fir.txt
index 99ae53668085..c51e46f206ab 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyAccessors.resolved.fir.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UReturnExpression -> UQualifiedReferenceExpression -> null: null
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Class:class PropertyTest {
     var stringRepresentation: String
@@ -14,4 +14,4 @@ UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = t
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = setDataFromString) -> Kotlin_Light_Method: setDataFromString
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = value) -> Kotlin_Light_Value_Parameter: value
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fe10.txt
index 8990d22651bf..c5af0a50f376 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fe10.txt
@@ -1,5 +1,5 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:lazy) -> USimpleNameReferenceExpression (identifier = lazy) -> PsiMethod:lazy: lazy
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:lazy) -> USimpleNameReferenceExpression (identifier = lazy) -> PsiMethod:lazy: lazy
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:lazy) -> USimpleNameReferenceExpression (identifier = lazy) -> PsiMethod:lazy: lazy
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lazy) -> Decompiled_Method: lazy
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lazy) -> Decompiled_Method: lazy
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = lazy) -> Decompiled_Method: lazy
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fir.txt
index cfb203e1a3d2..8b77613b0d0f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyDelegate.resolved.fir.txt
@@ -1,5 +1,5 @@
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lazy) -> FUN: lazy
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lazy) -> FUN: lazy
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = lazy) -> FUN: lazy
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fe10.txt
index 70d42801138c..f93242845cb8 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fe10.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> Kotlin_Light_Method: setMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = init) -> Kotlin_Light_Value_Parameter: init
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     ULocalVariable (name = result) -> USimpleNameReferenceExpression (identifier = privateProp) -> Kotlin_Light_Variable: privateProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = privateProp) -> Kotlin_Light_Variable: privateProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fir.txt
index 32013e9b97e8..8d062ff809cf 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyReferences.resolved.fir.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = mutableProp) -> Kotlin_Light_Method: setMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getMutableProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = init) -> Kotlin_Light_Value_Parameter: init
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     ULocalVariable (name = result) -> USimpleNameReferenceExpression (identifier = privateProp) -> Kotlin_Light_Variable: privateProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = privateProp) -> Kotlin_Light_Variable: privateProp
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Variable: privateProp
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fe10.txt
index e11354ff621d..fc2ae19fd878 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fe10.txt
@@ -1,9 +1,9 @@
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = field) -> Kotlin_Light_Method: setProp3
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = value) -> Kotlin_Light_Value_Parameter: value
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fir.txt
index 3c99efa7c00e..9ebdcbbc6f93 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/PropertyWithAnnotation.resolved.fir.txt
@@ -1,9 +1,9 @@
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = TestAnnotation) -> USimpleNameReferenceExpression (identifier = TestAnnotation) -> Kotlin_Light_Class:annotation class TestAnnotation: TestAnnotation
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = field) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = value) -> Kotlin_Light_Value_Parameter: value
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/QualifiedConstructorCall.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/QualifiedConstructorCall.resolved.fir.txt
index 247f9d471c6e..47bb11ce8c4b 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/QualifiedConstructorCall.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/QualifiedConstructorCall.resolved.fir.txt
@@ -10,4 +10,4 @@ UTypeReferenceExpression (name = A.B.C.Foo) -> USimpleNameReferenceExpression (i
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = A) -> PsiPackage:A: A
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = B) -> PsiPackage:A.B: B
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = C) -> PsiPackage:A.B.C: C
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Foo) -> Kotlin_Light_Class:internal class Foo: Foo
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Foo) -> Kotlin_Light_Class:internal class Foo: Foo
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fe10.txt
index 14023babfb48..447fe5f6c1d0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fe10.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = MyReceiverAnnotation) -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) -> Kotlin_Light_Class:annotation class MyReceiverAnnotation(val name: String = ""): MyReceiverAnnotation
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UReturnExpression -> UQualifiedReferenceExpression -> PsiMethod:length: length
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UReturnExpression -> UQualifiedReferenceExpression -> Decompiled_Method: length
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Method: foo
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = length) -> PsiMethod:length: length
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = length) -> Decompiled_Method: length
 UTypeReferenceExpression (name = MyReceiverAnnotation) -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) -> Kotlin_Light_Class:annotation class MyReceiverAnnotation(val name: String = ""): MyReceiverAnnotation
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = kotlin.text.Regex) -> USimpleNameReferenceExpression (identifier = Regex) -> PsiClass:Regex: Regex
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:toRegex) -> USimpleNameReferenceExpression (identifier = toRegex) -> PsiMethod:toRegex: toRegex
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = kotlin.text.Regex) -> USimpleNameReferenceExpression (identifier = Regex) -> Decompiled_Class: Regex
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = toRegex) -> Decompiled_Method: toRegex
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fir.txt
index 2d6446b196b4..80174cec98fe 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReceiverFun.resolved.fir.txt
@@ -1,10 +1,10 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = MyReceiverAnnotation) -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) -> Kotlin_Light_Class:annotation class MyReceiverAnnotation(val name: String = ""): MyReceiverAnnotation
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UReturnExpression -> UQualifiedReferenceExpression -> PROPERTY: length
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> TYPE_REFERENCE: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = length) -> PROPERTY: length
 UTypeReferenceExpression (name = MyReceiverAnnotation) -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) -> Kotlin_Light_Class:annotation class MyReceiverAnnotation(val name: String = ""): MyReceiverAnnotation
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = kotlin.text.Regex) -> USimpleNameReferenceExpression (identifier = Regex) -> CLASS: Regex
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = kotlin.text.Regex) -> USimpleNameReferenceExpression (identifier = Regex) -> Decompiled_Class: Regex
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toRegex) -> FUN: toRegex
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fe10.txt
index 3858f8a3c327..a128566666b3 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fe10.txt
@@ -2,26 +2,26 @@ null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PsiMethod:getJavaClass: getJavaClass
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
 UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiMethod:getJavaClass: getJavaClass
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PsiMethod:getJavaClass: getJavaClass
-UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiMethod:getJavaClass: getJavaClass
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
+UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UTypeReferenceExpression (name = test.pkg.Context) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     inline fun <reified T> ownSystemService1() = getSystemService(T::class.java)
     inline fun ownSystemService2() = getSystemService(String::class.java)
 }: Context
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PsiMethod:getJavaClass: getJavaClass
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
 UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiMethod:getJavaClass: getJavaClass
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UTypeReferenceExpression (name = test.pkg.Context) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     inline fun <reified T> ownSystemService1() = getSystemService(T::class.java)
     inline fun ownSystemService2() = getSystemService(String::class.java)
 }: Context
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PsiMethod:getJavaClass: getJavaClass
-UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiMethod:getJavaClass: getJavaClass
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
+UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fir.txt
index ea0e1f17fdf7..34ec512b4d21 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Reified.resolved.fir.txt
@@ -2,26 +2,26 @@ null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PROPERTY: java
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
 UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = T) -> null: null
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PROPERTY: java
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PROPERTY: java
-UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> OBJECT_DECLARATION: Companion
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PROPERTY: java
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
+UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: StringCompanionObject
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UTypeReferenceExpression (name = test.pkg.Context) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     inline fun <reified T> ownSystemService1() = getSystemService(T::class.java)
     inline fun ownSystemService2() = getSystemService(String::class.java)
 }: Context
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PROPERTY: java
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
 UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = T) -> null: null
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PROPERTY: java
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
 UTypeReferenceExpression (name = test.pkg.Context) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     inline fun <reified T> ownSystemService1() = getSystemService(T::class.java)
     inline fun ownSystemService2() = getSystemService(String::class.java)
 }: Context
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = getSystemService) -> null: null
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> PROPERTY: java
-UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> OBJECT_DECLARATION: Companion
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PROPERTY: java
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
+UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: StringCompanionObject
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fe10.txt
index 77293d327c75..43b9758f82c1 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fe10.txt
@@ -1,26 +1,26 @@
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = process) -> Kotlin_Light_Value_Parameter: process
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UArrayAccessExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Method: functionWithReceiver
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> Kotlin_Light_Method: name with spaces
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Unresolved) -> null: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fir.txt
index fd7201f63345..523e797523c2 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedParameters.resolved.fir.txt
@@ -1,26 +1,26 @@
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> TYPE_PARAMETER: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = process) -> Kotlin_Light_Value_Parameter: process
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = process) -> Kotlin_Light_Value_Parameter: process
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T[]) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UArrayAccessExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> TYPE_REFERENCE: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UThisExpression (label = null) -> USimpleNameReferenceExpression (identifier = this) -> TYPE_REFERENCE: null
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Unresolved) -> null: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> TYPE_PARAMETER: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fe10.txt
index 3f9fa51fd33f..266574544e1d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fe10.txt
@@ -1,22 +1,22 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
     ULocalVariable (name = z) -> UQualifiedReferenceExpression -> Kotlin_Light_Method: filterIsInstance
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = filterIsInstance) -> Kotlin_Light_Method: filterIsInstance
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fir.txt
index e07e4d180b59..4bd6067fad70 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedResolve.resolved.fir.txt
@@ -1,22 +1,22 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> TYPE_PARAMETER: T
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> TYPE_PARAMETER: T
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Method: bar
     ULocalVariable (name = z) -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = filterIsInstance) -> FUN: filterIsInstance
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fe10.txt
index 96210551b946..100b3d721d89 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fe10.txt
@@ -1,90 +1,90 @@
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Activity) -> null: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 null -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 null -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.lang.Comparable<? super T>) -> USimpleNameReferenceExpression (identifier = Comparable) -> PsiClass:Comparable: Comparable
+UTypeReferenceExpression (name = java.lang.Comparable<? super T>) -> USimpleNameReferenceExpression (identifier = Comparable) -> Decompiled_Class: Comparable
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 null -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UReturnExpression -> USimpleNameReferenceExpression (identifier = threshold2) -> Kotlin_Light_Value_Parameter: threshold2
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = Z) -> USimpleNameReferenceExpression (identifier = Z) -> Kotlin_Light_Type_Parameter: Z
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fir.txt
index 9c54faea87ec..4325809e0f44 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ReifiedReturnType.resolved.fir.txt
@@ -1,86 +1,86 @@
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Activity) -> null: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> TYPE_PARAMETER: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UReturnExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
-UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 UTypeReferenceExpression (name = B) -> USimpleNameReferenceExpression (identifier = B) -> Kotlin_Light_Type_Parameter: B
 null -> USimpleNameReferenceExpression (identifier = T) -> null: null
-UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> PsiClass:CharSequence: CharSequence
+UTypeReferenceExpression (name = java.lang.CharSequence) -> USimpleNameReferenceExpression (identifier = CharSequence) -> Decompiled_Class: CharSequence
 null -> USimpleNameReferenceExpression (identifier = T) -> null: null
-UTypeReferenceExpression (name = java.lang.Comparable<? super T>) -> USimpleNameReferenceExpression (identifier = Comparable) -> PsiClass:Comparable: Comparable
+UTypeReferenceExpression (name = java.lang.Comparable<? super T>) -> USimpleNameReferenceExpression (identifier = Comparable) -> Decompiled_Class: Comparable
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 null -> USimpleNameReferenceExpression (identifier = B) -> null: null
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fe10.txt
index 806564fb3925..24390a0f5451 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fe10.txt
@@ -14,56 +14,56 @@ UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: foo
     }
 }: A
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = inlineFoo) -> Kotlin_Light_Method: inlineFoo
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:forEach: forEach
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: forEach
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
     UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:forEach) -> USimpleNameReferenceExpression (identifier = forEach) -> PsiMethod:forEach: forEach
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = it) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:joinToString: joinToString
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:joinToString) -> USimpleNameReferenceExpression (identifier = joinToString) -> PsiMethod:joinToString: joinToString
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:size: size
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = size) -> PsiMethod:size: size
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:getIndices: getIndices
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = indices) -> PsiMethod:getIndices: getIndices
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = forEach) -> Decompiled_Method: forEach
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = it) -> null: null
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: joinToString
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = joinToString) -> Decompiled_Method: joinToString
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: size
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = size) -> Decompiled_Method: size
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: getIndices
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = indices) -> Decompiled_Method: getIndices
     UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
-    UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = Date) -> PsiClass:Date: Date
-    ULocalVariable (name = date) -> UQualifiedReferenceExpression -> PsiMethod:Date: Date
+    UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = Date) -> Decompiled_Class: Date
+    ULocalVariable (name = date) -> UQualifiedReferenceExpression -> Decompiled_Method: Date
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to PsiMethod:Date) -> USimpleNameReferenceExpression (identifier = Date) -> PsiMethod:Date: Date
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> PsiMethod:setTime: setTime
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Date) -> Decompiled_Method: Date
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> Decompiled_Method: setTime
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = date) -> Kotlin_Light_Variable: date
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = time) -> PsiMethod:setTime: setTime
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = time) -> Decompiled_Method: setTime
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:last: last
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:last) -> USimpleNameReferenceExpression (identifier = last) -> PsiMethod:last: last
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:setValue: setValue
-    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiMethod:first: first
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: last
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = last) -> Decompiled_Method: last
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: setValue
+    UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> Decompiled_Method: first
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:mutableMapOf) -> USimpleNameReferenceExpression (identifier = mutableMapOf) -> PsiMethod:mutableMapOf: mutableMapOf
-    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> PsiMethod:to: to
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = mutableMapOf) -> Decompiled_Method: mutableMapOf
+    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> Decompiled_Method: to
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = entries) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:first) -> USimpleNameReferenceExpression (identifier = first) -> PsiMethod:first: first
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:setValue) -> USimpleNameReferenceExpression (identifier = setValue) -> PsiMethod:setValue: setValue
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = first) -> Decompiled_Method: first
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = setValue) -> Decompiled_Method: setValue
     UBinaryExpression (operator = ..) -> USimpleNameReferenceExpression (identifier = ..) -> null: null
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:longRangeContains: longRangeContains
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: longRangeContains
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = intRange) -> Kotlin_Light_Variable: intRange
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:longRangeContains) -> USimpleNameReferenceExpression (identifier = contains) -> PsiMethod:longRangeContains: longRangeContains
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = contains) -> Decompiled_Method: longRangeContains
     UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to PsiMethod:IntRange) -> USimpleNameReferenceExpression (identifier = IntRange) -> PsiClass:IntRange: IntRange
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = IntRange) -> Decompiled_Class: IntRange
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
@@ -74,7 +74,7 @@ UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifie
     UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: foo
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-UTypeReferenceExpression (name = java.util.List<? extends A>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+UTypeReferenceExpression (name = java.util.List<? extends A>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
@@ -82,9 +82,9 @@ UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifie
     }
 }: A
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UBlockExpression -> UQualifiedReferenceExpression -> PsiMethod:isEmpty: isEmpty
+    UBlockExpression -> UQualifiedReferenceExpression -> Decompiled_Method: isEmpty
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = listT) -> Kotlin_Light_Value_Parameter: listT
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:isEmpty) -> USimpleNameReferenceExpression (identifier = isEmpty) -> PsiMethod:isEmpty: isEmpty
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = isEmpty) -> Decompiled_Method: isEmpty
     UForEachExpression -> USimpleNameReferenceExpression (identifier = listT) -> Kotlin_Light_Value_Parameter: listT
         UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: foo
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = a) -> VALUE_PARAMETER: a
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fir.txt
index 9b3957a445f8..ba00cc68c616 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Resolve.resolved.fir.txt
@@ -1,5 +1,5 @@
 UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
@@ -7,24 +7,24 @@ UBlockExpression -> UQualifiedReferenceExpression -> null: null
 }: A
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = inlineFoo) -> Kotlin_Light_Method: inlineFoo
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = inlineFoo) -> Kotlin_Light_Method: inlineFoo
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
 
     }
 }: A
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = forEach) -> FUN: forEach
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = joinToString) -> FUN: joinToString
@@ -36,16 +36,16 @@ UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = indices) -> PROPERTY: indices
     UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
-    UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = Date) -> PsiClass:Date: Date
+    UTypeReferenceExpression (name = java.util.Date) -> USimpleNameReferenceExpression (identifier = Date) -> Decompiled_Class: Date
     ULocalVariable (name = date) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to PsiMethod:Date) -> USimpleNameReferenceExpression (identifier = Date) -> PsiMethod:Date: Date
-    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> PsiMethod:getTime: getTime
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Date) -> Decompiled_Method: Date
+    UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = date) -> Kotlin_Light_Variable: date
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = time) -> PsiMethod:getTime: getTime
-    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> PsiMethod:getTime: getTime
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = time) -> null: null
+    UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = last) -> FUN: last
@@ -53,7 +53,7 @@ UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PROPERTY: entries
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = mutableMapOf) -> FUN: mutableMapOf
-    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> FUN: to
+    UBinaryExpression (operator = <other>) -> USimpleNameReferenceExpression (identifier = to) -> Decompiled_Method: to
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = entries) -> PROPERTY: entries
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = first) -> FUN: first
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = setValue) -> FUN: setValue
@@ -62,8 +62,8 @@ UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = intRange) -> Kotlin_Light_Variable: intRange
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = contains) -> FUN: contains
     UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
-    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = IntRange) -> PRIMARY_CONSTRUCTOR: IntRange
+    UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = IntRange) -> Decompiled_Class: IntRange
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
@@ -74,7 +74,7 @@ UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifie
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = t) -> Kotlin_Light_Value_Parameter: t
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
-UTypeReferenceExpression (name = java.util.List<? extends A>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+UTypeReferenceExpression (name = java.util.List<? extends A>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A {
     fun foo() {}
     inline fun inlineFoo() {
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fe10.txt
index 5a7ffa7bfe19..ef30bfa7517f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fe10.txt
@@ -1,63 +1,63 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Runnable: Runnable
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Runnable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Callable: Callable
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Callable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.concurrent: concurrent
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = concurrent) -> PsiPackage:java.util.concurrent: concurrent
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Supplier: Supplier
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Supplier
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.function: function
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = function) -> PsiPackage:java.util.function: function
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: setFoo
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> null: null
     UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
     UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = runRunnable) -> Kotlin_Light_Method: runRunnable
-UField (name = baz) -> UQualifiedReferenceExpression -> PsiClass:Runnable: Runnable
+UField (name = baz) -> UQualifiedReferenceExpression -> Decompiled_Class: Runnable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = r) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:Thread) -> USimpleNameReferenceExpression (identifier = Thread) -> PsiMethod:Thread: Thread
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:Thread) -> USimpleNameReferenceExpression (identifier = Thread) -> PsiMethod:Thread: Thread
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Method: Thread
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Method: Thread
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = ambiguousSamAcceptor) -> Kotlin_Light_Method: ambiguousSamAcceptor
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = ambiguousSamAcceptor) -> Kotlin_Light_Method: ambiguousSamAcceptor
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UTypeReferenceExpression (name = java.util.function.Supplier<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
-UTypeReferenceExpression (name = java.util.concurrent.Callable<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:TODO) -> USimpleNameReferenceExpression (identifier = TODO) -> PsiMethod:TODO: TODO
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UTypeReferenceExpression (name = java.util.function.Supplier<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
+UTypeReferenceExpression (name = java.util.concurrent.Callable<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = TODO) -> Decompiled_Method: TODO
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fir.txt
index 72966e72418b..c0fd37530e91 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SAM.resolved.fir.txt
@@ -1,63 +1,63 @@
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Thread: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Thread
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> PsiClass:Thread: Thread
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Runnable: Runnable
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Class: Thread
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Runnable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Callable: Callable
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Callable
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.concurrent: concurrent
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = concurrent) -> PsiPackage:java.util.concurrent: concurrent
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> PsiClass:Supplier: Supplier
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UImportStatement (isOnDemand = false) -> UQualifiedReferenceExpression -> Decompiled_Class: Supplier
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util.function: function
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = util) -> PsiPackage:java.util: util
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = function) -> PsiPackage:java.util.function: function
-UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
+UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: setFoo
     UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = =) -> Kotlin_Light_Method: getFoo
     UBinaryExpressionWithType -> USimpleNameReferenceExpression (identifier = as) -> null: null
     UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+    UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = runRunnable) -> Kotlin_Light_Method: runRunnable
 UField (name = baz) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> UQualifiedReferenceExpression -> PsiPackage:java.lang: lang
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
+UTypeReferenceExpression (name = java.lang.Runnable) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = r) -> null: null
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:Thread) -> USimpleNameReferenceExpression (identifier = Thread) -> PsiMethod:Thread: Thread
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:Thread) -> USimpleNameReferenceExpression (identifier = Thread) -> PsiMethod:Thread: Thread
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> PsiClass:Runnable: Runnable
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Method: Thread
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = Thread) -> Decompiled_Method: Thread
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Runnable) -> Decompiled_Class: Runnable
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = ambiguousSamAcceptor) -> Kotlin_Light_Method: ambiguousSamAcceptor
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = ambiguousSamAcceptor) -> Kotlin_Light_Method: ambiguousSamAcceptor
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UTypeReferenceExpression (name = java.util.function.Supplier<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Supplier) -> PsiClass:Supplier: Supplier
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UTypeReferenceExpression (name = java.util.function.Supplier<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Supplier) -> Decompiled_Class: Supplier
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
-UTypeReferenceExpression (name = java.util.concurrent.Callable<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Callable) -> PsiClass:Callable: Callable
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.util.concurrent.Callable<java.lang.String>) -> USimpleNameReferenceExpression (identifier = Callable) -> Decompiled_Class: Callable
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = TODO) -> FUN: TODO
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fe10.txt
deleted file mode 100644
index 2418a3653d88..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fe10.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fir.txt
deleted file mode 100644
index 6cd82be5436c..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.fir.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.txt
new file mode 100644
index 000000000000..392b2baf1c38
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Simple.resolved.txt
@@ -0,0 +1,2 @@
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fe10.txt
deleted file mode 100644
index 8d4e6e330c1d..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fe10.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PsiClass:Suppress: Suppress
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
-UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = SinceKotlin) -> PsiClass:SinceKotlin: SinceKotlin
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fir.txt
deleted file mode 100644
index 138882f56913..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.fir.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> PRIMARY_CONSTRUCTOR: Suppress
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
-UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = SinceKotlin) -> PRIMARY_CONSTRUCTOR: SinceKotlin
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.txt
new file mode 100644
index 000000000000..c1f36fea4555
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SimpleAnnotated.resolved.txt
@@ -0,0 +1,5 @@
+UTypeReferenceExpression (name = kotlin.Suppress) -> USimpleNameReferenceExpression (identifier = Suppress) -> Decompiled_Class: Suppress
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = kotlin) -> PsiPackage:kotlin: kotlin
+UTypeReferenceExpression (name = kotlin.SinceKotlin) -> USimpleNameReferenceExpression (identifier = SinceKotlin) -> Decompiled_Class: SinceKotlin
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fe10.txt
index c609fa502671..4c7011212ce4 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fe10.txt
@@ -1,15 +1,15 @@
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
-UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> PsiMethod:repeat: repeat
-UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> PsiMethod:repeat: repeat
+UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> Decompiled_Method: repeat
+UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> Decompiled_Method: repeat
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:repeat) -> USimpleNameReferenceExpression (identifier = repeat) -> PsiMethod:repeat: repeat
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = repeat) -> Decompiled_Method: repeat
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fir.txt
index 40aadb31377e..937a11ee848d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplex.resolved.fir.txt
@@ -5,11 +5,11 @@ UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> null: nul
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = repeat) -> FUN: repeat
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fe10.txt
index c609fa502671..4c7011212ce4 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fe10.txt
@@ -1,15 +1,15 @@
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
-UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> PsiMethod:repeat: repeat
-UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> PsiMethod:repeat: repeat
+UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> Decompiled_Method: repeat
+UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> Decompiled_Method: repeat
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:repeat) -> USimpleNameReferenceExpression (identifier = repeat) -> PsiMethod:repeat: repeat
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = repeat) -> Decompiled_Method: repeat
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt
index 40aadb31377e..937a11ee848d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt
@@ -5,11 +5,11 @@ UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression -> null: nul
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = repeat) -> FUN: repeat
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> null: null
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fe10.txt
index 254eab05829f..01cf3a554312 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fe10.txt
@@ -1,11 +1,11 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PsiMethod:toString: toString
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: toString
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> PsiMethod:toString: toString
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> Decompiled_Method: toString
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = param) -> Kotlin_Light_Value_Parameter: param
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
@@ -15,14 +15,14 @@ UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifie
     open fun foo(a: Long) {}
 
 }: A
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = p) -> Kotlin_Light_Value_Parameter: p
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:println) -> USimpleNameReferenceExpression (identifier = println) -> PsiMethod:println: println
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
     UBlockExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: foo
     USuperExpression (label = null) -> USimpleNameReferenceExpression (identifier = super) -> Kotlin_Light_Class:open class A(val str: String) {
 
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fir.txt
index c6b4f2bef65f..1d5766e72582 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/SuperCalls.resolved.fir.txt
@@ -1,18 +1,12 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> null: null
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
-
-    constructor(i: Int) : this(i.toString())
-
-    open fun foo(a: Long) {}
-
-}: A
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = param) -> Kotlin_Light_Value_Parameter: param
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
 
@@ -21,14 +15,14 @@ UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifie
     open fun foo(a: Long) {}
 
 }: A
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = p) -> Kotlin_Light_Value_Parameter: p
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> Kotlin_Light_Method:
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = println) -> FUN: println
-UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> PsiClass:Long: Long
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = println) -> Decompiled_Method: println
+UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identifier = Long) -> Decompiled_Class: Long
     UBlockExpression -> UQualifiedReferenceExpression -> null: null
     USuperExpression (label = null) -> USimpleNameReferenceExpression (identifier = super) -> Kotlin_Light_Class:open class A(val str: String) {
 
@@ -39,37 +33,13 @@ UTypeReferenceExpression (name = long) -> USimpleNameReferenceExpression (identi
 }: A
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = foo) -> Kotlin_Light_Method: foo
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Value_Parameter: a
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
-
-    constructor(i: Int) : this(i.toString())
-
-    open fun foo(a: Long) {}
-
-}: A
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
 UField (name = anon) -> UObjectLiteralExpression -> Kotlin_Light_Method:
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
-
-    constructor(i: Int) : this(i.toString())
-
-    open fun foo(a: Long) {}
-
-}: A
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = cons) -> Kotlin_Light_Method: cons
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> UObjectLiteralExpression -> Kotlin_Light_Method:
-    UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
-
-    constructor(i: Int) : this(i.toString())
-
-    open fun foo(a: Long) {}
-
-}: A
-UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
-
-    constructor(i: Int) : this(i.toString())
-
-    open fun foo(a: Long) {}
-
-}: A
+    UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
+UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Method: A
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:open class A(val str: String) {
 
     constructor(i: Int) : this(i.toString())
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fe10.txt
index a6ab94604254..f94ff8dc79f9 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fe10.txt
@@ -1,11 +1,11 @@
 null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = suspendPrivate) -> Kotlin_Light_Method: suspendPrivate
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = inner) -> Kotlin_Light_Method: inner
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> UQualifiedReferenceExpression -> Kotlin_Light_Method: inner
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     suspend fun inner(): Int = suspendPrivate()
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fir.txt
index 2453cf2d554d..3912971f0614 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/Suspend.resolved.fir.txt
@@ -1,13 +1,13 @@
 null -> UQualifiedReferenceExpression -> PsiPackage:test.pkg: pkg
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = test) -> PsiPackage:test: test
 UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = pkg) -> PsiPackage:test.pkg: pkg
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = suspendPrivate) -> Kotlin_Light_Method: suspendPrivate
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = inner) -> Kotlin_Light_Method: inner
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
 UReturnExpression -> UQualifiedReferenceExpression -> null: null
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Context) -> Kotlin_Light_Class:class Context {
     suspend fun inner(): Int = suspendPrivate()
     private suspend fun suspendPrivate(): Int = inner()
 }: Context
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TryCatch.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TryCatch.resolved.txt
index fc58f55b63f7..aa4c801df6fa 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TryCatch.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TryCatch.resolved.txt
@@ -1,14 +1,14 @@
 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = body) -> Kotlin_Light_Method: body
-    UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
+    UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = catcher) -> Kotlin_Light_Method: catcher
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = finalizer) -> Kotlin_Light_Method: finalizer
 UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
 UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = SuppressWarnings) -> PsiClass:SuppressWarnings: SuppressWarnings
+UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = SuppressWarnings) -> Decompiled_Class: SuppressWarnings
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = body) -> Kotlin_Light_Method: body
     UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = java) -> PsiPackage:java: java
     UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = lang) -> PsiPackage:java.lang: lang
-    UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = SuppressWarnings) -> PsiClass:SuppressWarnings: SuppressWarnings
-    UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
+    UTypeReferenceExpression (name = java.lang.SuppressWarnings) -> USimpleNameReferenceExpression (identifier = SuppressWarnings) -> Decompiled_Class: SuppressWarnings
+    UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = catcher) -> Kotlin_Light_Method: catcher
-        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = finalizer) -> Kotlin_Light_Method: finalizer
\ No newline at end of file
+        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = finalizer) -> Kotlin_Light_Method: finalizer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fe10.txt
index 892084852b6c..805b69fef7e3 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fe10.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A(param: String): A
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = AA) -> Kotlin_Light_Class:class A(param: String): A
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = AA) -> Kotlin_Light_Class:class A(param: String): A
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fir.txt
index e0327b15b02e..8fe1a0b32453 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasConstructorReference.resolved.fir.txt
@@ -1,4 +1,4 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A(param: String): A
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = AA) -> Kotlin_Light_Class:class A(param: String): A
 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = AA) -> Kotlin_Light_Method: A
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fe10.txt
index 42be12adf086..481e4f94c878 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fe10.txt
@@ -1,17 +1,17 @@
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Unit) -> PsiClass:Unit: Unit
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> PsiClass:Function1: Function1
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> PsiClass:Function1: Function1
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> PsiClass:Function1: Function1
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fir.txt
index 52773144c98f..bdfb0c463b71 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliasExpansionWithOtherAliasInArgument.resolved.fir.txt
@@ -1,17 +1,17 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> OBJECT_DECLARATION: Unit
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> TYPEALIAS: My
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> TYPEALIAS: My
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> TYPEALIAS: My
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> PsiClass:Map: Map
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> PsiClass:String: String
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = kotlin.Unit) -> USimpleNameReferenceExpression (identifier = Unit) -> Decompiled_Class: Unit
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,? extends java.lang.Integer>,? extends kotlin.Unit>) -> USimpleNameReferenceExpression (identifier = My) -> Decompiled_Class: Function1
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.util.Map<java.lang.String,? extends java.lang.Integer>) -> USimpleNameReferenceExpression (identifier = Map) -> Decompiled_Class: Map
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = A) -> Decompiled_Class: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fe10.txt
index a3f152df2681..048750179c41 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fe10.txt
@@ -1,5 +1,5 @@
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
 UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = F) -> PsiClass:Function2: Function2
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = F) -> PsiClass:Function2: Function2
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = F) -> Decompiled_Class: Function2
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = F) -> Decompiled_Class: Function2
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fir.txt
index a195190368c3..8f7f279f827e 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeAliases.resolved.fir.txt
@@ -1,5 +1,5 @@
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
 UTypeReferenceExpression (name = A) -> USimpleNameReferenceExpression (identifier = A) -> Kotlin_Light_Class:class A: A
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function2<? super A,? super A,? extends A>) -> USimpleNameReferenceExpression (identifier = F) -> TYPEALIAS: F
-UTypeReferenceExpression (name = kotlin.jvm.functions.Function2<? super A,? super A,? extends A>) -> USimpleNameReferenceExpression (identifier = F) -> TYPEALIAS: F
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function2<? super A,? super A,? extends A>) -> USimpleNameReferenceExpression (identifier = F) -> Decompiled_Class: Function2
+UTypeReferenceExpression (name = kotlin.jvm.functions.Function2<? super A,? super A,? extends A>) -> USimpleNameReferenceExpression (identifier = F) -> Decompiled_Class: Function2
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fe10.txt
index 54c346163199..7b761eb2af16 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fe10.txt
@@ -1,38 +1,38 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = varWithType) -> Kotlin_Light_Variable: varWithType
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> null: null
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = varWithoutType) -> Kotlin_Light_Variable: varWithoutType
     UReturnExpression -> USimpleNameReferenceExpression (identifier = result) -> Kotlin_Light_Variable: result
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     ULocalVariable (name = a) -> USimpleNameReferenceExpression (identifier = arg) -> Kotlin_Light_Value_Parameter: arg
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     ULocalVariable (name = var708e23eb) -> USimpleNameReferenceExpression (identifier = arg) -> Kotlin_Light_Value_Parameter: arg
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
-    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = at) -> Kotlin_Light_Variable: at
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    ULocalVariable (name = tsl) -> UQualifiedReferenceExpression -> PsiMethod:map: map
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = at) -> Kotlin_Light_Variable: at
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    ULocalVariable (name = tsl) -> UQualifiedReferenceExpression -> Decompiled_Method: map
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = tl) -> Kotlin_Light_Variable: tl
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to PsiMethod:map) -> USimpleNameReferenceExpression (identifier = map) -> PsiMethod:map: map
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = map) -> Decompiled_Method: map
         UReturnExpression -> UQualifiedReferenceExpression -> null: null
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> null: null
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> null: null
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = ListOfLists) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends T>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = ListOfLists) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends T>>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = parameterizedFoo) -> Kotlin_Light_Method: parameterizedFoo
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:emptyList) -> USimpleNameReferenceExpression (identifier = emptyList) -> PsiMethod:emptyList: emptyList
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = emptyList) -> Decompiled_Method: emptyList
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt
index ab547239a290..2b226a12a22e 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt
@@ -1,38 +1,38 @@
-UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> PsiClass:Integer: Integer
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = varWithType) -> Kotlin_Light_Variable: varWithType
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
     UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = varWithoutType) -> Kotlin_Light_Variable: varWithoutType
     UReturnExpression -> USimpleNameReferenceExpression (identifier = result) -> Kotlin_Light_Variable: result
-UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     ULocalVariable (name = a) -> USimpleNameReferenceExpression (identifier = arg) -> Kotlin_Light_Value_Parameter: arg
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     ULocalVariable (name = var708e23eb) -> USimpleNameReferenceExpression (identifier = arg) -> Kotlin_Light_Value_Parameter: arg
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
-    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = at) -> Kotlin_Light_Variable: at
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     ULocalVariable (name = tsl) -> UQualifiedReferenceExpression -> null: null
     UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = tl) -> Kotlin_Light_Variable: tl
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = map) -> FUN: map
         UReturnExpression -> UQualifiedReferenceExpression -> null: null
         UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> FUNCTION_LITERAL: <anonymous>
         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = ListOfLists) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends T>>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends java.lang.String>>) -> USimpleNameReferenceExpression (identifier = ListOfLists) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends java.util.List<? extends T>>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = parameterizedFoo) -> Kotlin_Light_Method: parameterizedFoo
-    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
-    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+    UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
+    UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = emptyList) -> FUN: emptyList
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fe10.txt
index 0d11a7cf37e1..dc2294d1ed27 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fe10.txt
@@ -1,18 +1,18 @@
-UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
+UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = crashMe) -> Kotlin_Light_Method: crashMe
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PsiMethod:getJavaClass: getJavaClass
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
     UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = Callback) -> Kotlin_Light_Class:interface Callback {
     fun onError(throwable: Throwable)
 }: Callback
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PsiMethod:getJavaClass: getJavaClass
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
         UReturnExpression -> UObjectLiteralExpression -> null:
         UTypeReferenceExpression (name = Callback) -> USimpleNameReferenceExpression (identifier = Callback) -> Kotlin_Light_Class:interface Callback {
     fun onError(throwable: Throwable)
 }: Callback
-        UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:UnsupportedOperationException) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> PsiClass:UnsupportedOperationException: UnsupportedOperationException
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = java.lang.Class<T>) -> USimpleNameReferenceExpression (identifier = Class) -> PsiClass:Class: Class
+        UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> Decompiled_Class: UnsupportedOperationException
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = java.lang.Class<T>) -> USimpleNameReferenceExpression (identifier = Class) -> Decompiled_Class: Class
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to PsiMethod:UnsupportedOperationException) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> PsiClass:UnsupportedOperationException: UnsupportedOperationException
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> Decompiled_Class: UnsupportedOperationException
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fir.txt
index 05ea26e74c75..5de71f54657f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/UnexpectedContainerException.resolved.fir.txt
@@ -1,18 +1,18 @@
-UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
+UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = crashMe) -> Kotlin_Light_Method: crashMe
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> PROPERTY: java
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Kotlin_Light_Method) -> UQualifiedReferenceExpression -> Decompiled_Method: getJavaClass
     UClassLiteralExpression -> USimpleNameReferenceExpression (identifier = Callback) -> Kotlin_Light_Class:interface Callback {
     fun onError(throwable: Throwable)
 }: Callback
-    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> PROPERTY: java
+    UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = java) -> Decompiled_Method: getJavaClass
         UReturnExpression -> UObjectLiteralExpression -> null:
         UTypeReferenceExpression (name = Callback) -> USimpleNameReferenceExpression (identifier = Callback) -> Kotlin_Light_Class:interface Callback {
     fun onError(throwable: Throwable)
 }: Callback
-        UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> PsiClass:Throwable: Throwable
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to PsiMethod:UnsupportedOperationException) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> PsiMethod:UnsupportedOperationException: UnsupportedOperationException
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
-UTypeReferenceExpression (name = java.lang.Class<T>) -> USimpleNameReferenceExpression (identifier = Class) -> PsiClass:Class: Class
+        UTypeReferenceExpression (name = java.lang.Throwable) -> USimpleNameReferenceExpression (identifier = Throwable) -> Decompiled_Class: Throwable
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> Decompiled_Method: UnsupportedOperationException
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
+UTypeReferenceExpression (name = java.lang.Class<T>) -> USimpleNameReferenceExpression (identifier = Class) -> Decompiled_Class: Class
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
-    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to PsiMethod:UnsupportedOperationException) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> PsiMethod:UnsupportedOperationException: UnsupportedOperationException
+    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = UnsupportedOperationException) -> Decompiled_Method: UnsupportedOperationException
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fe10.txt
index 941fa2fc227e..a90021fca174 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fe10.txt
@@ -1,6 +1,6 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to PsiMethod:listOf) -> USimpleNameReferenceExpression (identifier = listOf) -> PsiMethod:listOf: listOf
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = listOf) -> Decompiled_Method: listOf
     USwitchExpression -> USimpleNameReferenceExpression (identifier = string) -> Kotlin_Light_Value_Parameter: string
         ULocalVariable (name = var837f2350) -> USimpleNameReferenceExpression (identifier = arr) -> Kotlin_Light_Variable: arr
         UReturnExpression -> USimpleNameReferenceExpression (identifier = bindingContext) -> Kotlin_Light_Variable: bindingContext
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt
index d8604105ec6c..bacb47c0182f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt
@@ -1,5 +1,5 @@
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to null) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
     USwitchExpression -> USimpleNameReferenceExpression (identifier = string) -> Kotlin_Light_Value_Parameter: string
         ULocalVariable (name = var837f2350) -> USimpleNameReferenceExpression (identifier = arr) -> Kotlin_Light_Variable: arr
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenIs.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenIs.resolved.txt
index e05b3863e2f7..83e9a22d5b61 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenIs.resolved.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenIs.resolved.txt
@@ -1,5 +1,5 @@
-UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> PsiClass:Object: Object
+UTypeReferenceExpression (name = java.lang.Object) -> USimpleNameReferenceExpression (identifier = Any) -> Decompiled_Class: Object
 USwitchExpression -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Value_Parameter: bar
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
 UYieldExpression -> USimpleNameReferenceExpression (identifier = bar) -> Kotlin_Light_Value_Parameter: bar
-UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> PsiClass:String: String
\ No newline at end of file
+UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fe10.txt
deleted file mode 100644
index 5fc4ffb666bd..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fe10.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to PsiMethod:readLine) -> USimpleNameReferenceExpression (identifier = readLine) -> PsiMethod:readLine: readLine
-USwitchExpression -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: getA
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fir.txt
deleted file mode 100644
index 3a35e33e98ab..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.fir.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = readLine) -> FUN: readLine
-USwitchExpression -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: getA
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.txt
new file mode 100644
index 000000000000..b92292f888bf
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenStringLiteral.resolved.txt
@@ -0,0 +1,2 @@
+UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = readLine) -> Decompiled_Method: readLine
+USwitchExpression -> USimpleNameReferenceExpression (identifier = a) -> Kotlin_Light_Method: getA
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ea101715.resolved.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ea101715.resolved.fir.txt
index ce4e191141fc..a2b97f2cd018 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ea101715.resolved.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/ea101715.resolved.fir.txt
@@ -1 +1 @@
-UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to null) -> USimpleNameReferenceExpression (identifier = Obj) -> Kotlin_Light_Class:object Obj: Obj
+UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = Obj) -> Kotlin_Light_Class:object Obj: Obj
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/AnnotatedTypes.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/AnnotatedTypes.types.fir.txt
new file mode 100644
index 000000000000..3203c3c680ab
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/AnnotatedTypes.types.fir.txt
@@ -0,0 +1,29 @@
+UFile (package = ) [public final class AnnotatedTypesKt {...]
+    UClass (name = AnnotatedTypesKt) [public final class AnnotatedTypesKt {...}]
+        UMethod (name = foo) [public static final fun foo(@org.jetbrains.annotations.NotNull list: java.util.List<java.lang.String>) : void {...}]
+            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<java.lang.String>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Unit
+                UDeclarationsExpression [var a: java.lang.String = list[2]]
+                    ULocalVariable (name = a) [var a: java.lang.String = list[2]]
+                        UArrayAccessExpression [list[2]] : PsiType:String
+                            USimpleNameReferenceExpression (identifier = list) [list] : PsiType:List<? extends String>
+                            ULiteralExpression (value = 2) [2] : PsiType:int
+                UDeclarationsExpression [var b: java.lang.String = "abc"]
+                    ULocalVariable (name = b) [var b: java.lang.String = "abc"]
+                        ULiteralExpression (value = "abc") ["abc"] : PsiType:String
+                UDeclarationsExpression [var c: java.lang.String = b]
+                    ULocalVariable (name = c) [var c: java.lang.String = b]
+                        USimpleNameReferenceExpression (identifier = b) [b] : PsiType:String
+                UDeclarationsExpression [var v: java.lang.String = "abc"]
+                    ULocalVariable (name = v) [var v: java.lang.String = "abc"]
+                        ULiteralExpression (value = "abc") ["abc"] : PsiType:String
+    UClass (name = MyAnnotation) [public abstract annotation MyAnnotation {...}]
+        UAnnotation (fqName = kotlin.annotation.Target) [@kotlin.annotation.Target(allowedTargets = AnnotationTarget.TYPE)]
+            UNamedExpression (name = allowedTargets) [allowedTargets = AnnotationTarget.TYPE]
+                UQualifiedReferenceExpression [AnnotationTarget.TYPE] : PsiType:AnnotationTarget
+                    USimpleNameReferenceExpression (identifier = AnnotationTarget) [AnnotationTarget] : PsiType:Unit
+                    USimpleNameReferenceExpression (identifier = TYPE) [TYPE] : PsiType:AnnotationTarget
+        UAnnotationMethod (name = a) [public abstract fun a() : int = UastEmptyExpression]
+        UAnnotationMethod (name = b) [public abstract fun b() : java.lang.String = UastEmptyExpression]
+        UAnnotationMethod (name = c) [public abstract fun c() : kotlin.annotation.AnnotationTarget = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/BrokenDataClass.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/BrokenDataClass.types.fir.txt
new file mode 100644
index 000000000000..c292983327b0
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/BrokenDataClass.types.fir.txt
@@ -0,0 +1,21 @@
+UFile (package = ) [public final class Cls : <ErrorType> {...]
+    UClass (name = Cls) [public final class Cls : <ErrorType> {...}]
+        UField (name = a) [@org.jetbrains.annotations.NotNull private final var a: long]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = getA) [public final fun getA() : long = UastEmptyExpression]
+        UMethod (name = Cls) [public fun Cls(@org.jetbrains.annotations.NotNull a: long, @org.jetbrains.annotations.NotNull b: long) {...}]
+            UParameter (name = a) [@org.jetbrains.annotations.NotNull var a: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = b) [@org.jetbrains.annotations.NotNull var b: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) [<anonymous class>(a, a, a)]
+                    UIdentifier (Identifier (this)) [UIdentifier (Identifier (this))]
+                    USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>]
+                    USimpleNameReferenceExpression (identifier = a) [a] : PsiType:long
+                    USimpleNameReferenceExpression (identifier = a) [a] : PsiType:long
+                    USimpleNameReferenceExpression (identifier = a) [a] : PsiType:long
+        UMethod (name = component1) [public final fun component1() : long = UastEmptyExpression]
+        UMethod (name = copy) [public final fun copy(@org.jetbrains.annotations.NotNull a: long) : Cls = UastEmptyExpression]
+            UParameter (name = a) [@org.jetbrains.annotations.NotNull var a: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/CommentOwners.types.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/CommentOwners.types.txt
index 29e70ef7eb5f..dfbe3b1ddc31 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/CommentOwners.types.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/CommentOwners.types.txt
@@ -76,4 +76,8 @@ UFile (package = ) [public final class CommentOwnersKt {...]
         UEnumConstant (name = FALSE) [@null FALSE]
             UAnnotation (fqName = null) [@null]
             USimpleNameReferenceExpression (identifier = MyBooleanEnum) [MyBooleanEnum]
-        UMethod (name = MyBooleanEnum) [private fun MyBooleanEnum() = UastEmptyExpression]
\ No newline at end of file
+        UMethod (name = MyBooleanEnum) [private fun MyBooleanEnum() = UastEmptyExpression]
+        UMethod (name = values) [public static fun values() : MyBooleanEnum[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : MyBooleanEnum = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fe10.txt
index 04951ffee51d..7d72df2e3d89 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fe10.txt
@@ -17,7 +17,7 @@ UFile (package = ) [public final class MyColor {...]
             UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
     UClass (name = Some) [public final class Some {...}]
-        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy]
+        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends MyColor>
                 UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fir.txt
index f5a9aeb90c54..dd507328b704 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Delegate.types.fir.txt
@@ -17,7 +17,7 @@ UFile (package = ) [public final class MyColor {...]
             UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
     UClass (name = Some) [public final class Some {...}]
-        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<MyColor>]
+        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends MyColor>
                 UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValueMembers.types.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValueMembers.types.txt
index 6531f857ff9d..e55a81017971 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValueMembers.types.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValueMembers.types.txt
@@ -16,4 +16,8 @@ UFile (package = ) [public enum Style {...]
         UMethod (name = getValue) [public final fun getValue() : java.lang.String = UastEmptyExpression]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.NotNull var value: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
\ No newline at end of file
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValuesConstructors.types.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValuesConstructors.types.txt
index 0c2ea894706a..559db2b88402 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValuesConstructors.types.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/EnumValuesConstructors.types.txt
@@ -21,4 +21,8 @@ UFile (package = ) [public enum Style {...]
         UMethod (name = getValue) [public final fun getValue() : java.lang.String = UastEmptyExpression]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.Nullable var value: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
\ No newline at end of file
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt
index 1551faee8bf9..fd5d24b27796 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt
@@ -131,8 +131,8 @@ UFile (package = org.jetbrains.uast.kotlin) [package org.jetbrains.uast.kotlin..
                                     UIdentifier (Identifier (listOf)) [UIdentifier (Identifier (listOf))]
                                     USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null) [listOf] : PsiType:List<? extends Integer>
                                     ULiteralExpression (value = 1) [1] : PsiType:int
-        UMethod (name = bar) [private static fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Integer>) : void {...}]
-            UParameter (name = lmbd) [@org.jetbrains.annotations.NotNull var lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Integer>]
+        UMethod (name = bar) [private static final fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer>) : void {...}]
+            UParameter (name = lmbd) [@org.jetbrains.annotations.NotNull var lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer>]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UBlockExpression [{...}] : PsiType:int
                 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [invoke(1)] : PsiType:int
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fe10.txt
index 5687a05ae249..ad38c4e7d172 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fe10.txt
@@ -1,6 +1,6 @@
 UFile (package = ) [public final class PropertyDelegateKt {...]
     UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}]
-        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy]
+        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<? extends java.lang.String>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends String>
                 UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
@@ -9,7 +9,7 @@ UFile (package = ) [public final class PropertyDelegateKt {...]
                     UBlockExpression [{...}]
                         UReturnExpression [return "/sdcard"]
                             ULiteralExpression (value = "/sdcard") ["/sdcard"] : PsiType:String
-        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy]
+        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<? extends java.lang.Integer>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UAnnotation (fqName = kotlin.Suppress) [@kotlin.Suppress]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends Integer>
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt
index 0ea5a0da58b2..ae0e00e7a98f 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt
@@ -1,6 +1,6 @@
 UFile (package = ) [public final class PropertyDelegateKt {...]
     UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}]
-        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<java.lang.String>]
+        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<? extends java.lang.String>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends String>
                 UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
@@ -9,7 +9,7 @@ UFile (package = ) [public final class PropertyDelegateKt {...]
                     UBlockExpression [{...}] : PsiType:String
                         UReturnExpression [return "/sdcard"]
                             ULiteralExpression (value = "/sdcard") ["/sdcard"] : PsiType:String
-        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<java.lang.Integer>]
+        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<? extends java.lang.Integer>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UAnnotation (fqName = kotlin.Suppress) [@kotlin.Suppress]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends Integer>
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Reified.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Reified.types.fir.txt
index a7dd6e6d53ef..af935ff6bd10 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Reified.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Reified.types.fir.txt
@@ -1,5 +1,16 @@
 UFile (package = test.pkg) [package test.pkg...]
     UClass (name = ReifiedKt) [public final class ReifiedKt {...}]
+        UMethod (name = systemService2) [public static final fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : error.NonExistentClass {...}]
+            UParameter (name = $this$systemService2) [@org.jetbrains.annotations.NotNull var $this$systemService2: test.pkg.Context]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return <anonymous class>(java.lang.String.java)]
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] : PsiType:<ErrorType>
+                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] : PsiType:<ErrorType>
+                        UQualifiedReferenceExpression [java.lang.String.java] : PsiType:Class<String>
+                            UClassLiteralExpression [java.lang.String] : PsiType:KClass<String>
+                            USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<T>
         UMethod (name = systemService1) [public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {...}]
             UParameter (name = $this$systemService1) [@org.jetbrains.annotations.NotNull var $this$systemService1: test.pkg.Context]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
@@ -11,9 +22,8 @@ UFile (package = test.pkg) [package test.pkg...]
                         UQualifiedReferenceExpression [T.java] : PsiType:Class<T>
                             UClassLiteralExpression [T] : PsiType:KClass<T>
                             USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<T>
-        UMethod (name = systemService2) [public static fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : <ErrorType> {...}]
-            UParameter (name = $this$systemService2) [@org.jetbrains.annotations.NotNull var $this$systemService2: test.pkg.Context]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+    UClass (name = Context) [public final class Context {...}]
+        UMethod (name = ownSystemService2) [public final fun ownSystemService2() : error.NonExistentClass {...}]
             UBlockExpression [{...}]
                 UReturnExpression [return <anonymous class>(java.lang.String.java)]
                     UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] : PsiType:<ErrorType>
@@ -22,7 +32,6 @@ UFile (package = test.pkg) [package test.pkg...]
                         UQualifiedReferenceExpression [java.lang.String.java] : PsiType:Class<String>
                             UClassLiteralExpression [java.lang.String] : PsiType:KClass<String>
                             USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<T>
-    UClass (name = Context) [public final class Context {...}]
         UMethod (name = Context) [public fun Context() = UastEmptyExpression]
         UMethod (name = ownSystemService1) [public fun ownSystemService1() : <ErrorType> {...}]
             UBlockExpression [{...}]
@@ -33,12 +42,3 @@ UFile (package = test.pkg) [package test.pkg...]
                         UQualifiedReferenceExpression [T.java] : PsiType:Class<T>
                             UClassLiteralExpression [T] : PsiType:KClass<T>
                             USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<T>
-        UMethod (name = ownSystemService2) [public fun ownSystemService2() : <ErrorType> {...}]
-            UBlockExpression [{...}]
-                UReturnExpression [return <anonymous class>(java.lang.String.java)]
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] : PsiType:<ErrorType>
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] : PsiType:<ErrorType>
-                        UQualifiedReferenceExpression [java.lang.String.java] : PsiType:Class<String>
-                            UClassLiteralExpression [java.lang.String] : PsiType:KClass<String>
-                            USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<T>
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt
index 071832639650..af8a9968caa0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt
@@ -1,5 +1,15 @@
 UFile (package = ) [public final class ReifiedResolveKt {...]
     UClass (name = ReifiedResolveKt) [public final class ReifiedResolveKt {...}]
+        UMethod (name = bar) [public static final fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit>) : T {...}]
+            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit> = { ...}]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+                ULambdaExpression [{ ...}] : PsiType:Function1<? super T, ? extends Unit>
+                    UBlockExpression [{...}] : PsiType:Unit
+            UBlockExpression [{...}] : PsiType:Void
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] : PsiType:Void
+                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
+                    ULiteralExpression (value = "message") ["message"] : PsiType:String
         UMethod (name = resolve) [public static final fun resolve() : void {...}]
             UBlockExpression [{...}] : PsiType:Unit
                 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] : PsiType:String
@@ -38,13 +48,3 @@ UFile (package = ) [public final class ReifiedResolveKt {...]
                     UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
                     USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
                     ULiteralExpression (value = "message") ["message"] : PsiType:String
-        UMethod (name = bar) [public static fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {...}]
-            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> = { ...}]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-                ULambdaExpression [{ ...}] : PsiType:Function1<? super T, ? extends Unit>
-                    UBlockExpression [{...}] : PsiType:Unit
-            UBlockExpression [{...}] : PsiType:Void
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] : PsiType:Void
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
-                    ULiteralExpression (value = "message") ["message"] : PsiType:String
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fe10.txt
deleted file mode 100644
index 86ee9a701e64..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fe10.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = ) [public final class ReifiedReturnTypeKt {...]
-    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
-        UMethod (name = function1) [public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Unit
-        UMethod (name = function2) [public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function2CharSequence) [public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
-            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Void
-                UReturnExpression [return threshold2] : PsiType:Void
-                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] : PsiType:B
-        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Unit
-        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return 42]
-                    ULiteralExpression (value = 42) [42] : PsiType:int
-        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
-            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:B
-    UClass (name = Foo) [public final class Foo {...}]
-        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
-        UMethod (name = foo) [public fun foo() : Z {...}]
-            UBlockExpression [{...}] : PsiType:Void
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] : PsiType:Void
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt
deleted file mode 100644
index 735a47db6bc1..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = ) [public final class ReifiedReturnTypeKt {...]
-    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
-        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
-            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Void
-                UReturnExpression [return threshold2] : PsiType:Void
-                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] : PsiType:B
-        UMethod (name = function1) [public static fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Unit
-        UMethod (name = function2) [public static fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function2CharSequence) [public static fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] : PsiType:Unit
-        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return 42]
-                    ULiteralExpression (value = 42) [42] : PsiType:int
-        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
-        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
-            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}]
-                UReturnExpression [return t]
-                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:B
-    UClass (name = Foo) [public final class Foo {...}]
-        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
-        UMethod (name = foo) [public fun foo() : Z {...}]
-            UBlockExpression [{...}] : PsiType:Void
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] : PsiType:Void
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.txt
new file mode 100644
index 000000000000..e41b76b30371
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.txt
@@ -0,0 +1,163 @@
+UFile (package = ) [public final class ReifiedReturnTypeKt {...]
+    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
+        UMethod (name = function1) [public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Unit
+        UMethod (name = function2) [public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function2CharSequence) [public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
+            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UReturnExpression [return threshold2] : PsiType:Void
+                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] : PsiType:B
+        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Unit
+        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return 42]
+                    ULiteralExpression (value = 42) [42] : PsiType:int
+        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T
+        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
+            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}]
+                UReturnExpression [return t]
+                    USimpleNameReferenceExpression (identifier = t) [t] : PsiType:B
+    UClass (name = Foo) [public final class Foo {...}]
+        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
+        UMethod (name = foo) [public fun foo() : Z {...}]
+            UBlockExpression [{...}] : PsiType:Void
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] : PsiType:Void
+                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] : PsiType:Void
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt
index 0ef2dac5e470..9b3906c53153 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt
@@ -110,7 +110,7 @@ UFile (package = ) [public final class ResolveKt {...]
                             UTypeReferenceExpression (name = int) [int]
                 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2)) [<init>(1, 2)] : PsiType:IntRange
                     UIdentifier (Identifier (IntRange)) [UIdentifier (Identifier (IntRange))]
-                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = null) [<init>] : PsiType:IntRange
+                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: IntRange) [<init>] : PsiType:IntRange
                     ULiteralExpression (value = 1) [1] : PsiType:int
                     ULiteralExpression (value = 2) [2] : PsiType:int
         UMethod (name = barT) [public static final fun barT(@org.jetbrains.annotations.NotNull t: T) : void {...}]
@@ -142,6 +142,6 @@ UFile (package = ) [public final class ResolveKt {...]
     UClass (name = A) [public class A {...}]
         UMethod (name = foo) [public final fun foo() : void {...}]
             UBlockExpression [{...}] : PsiType:Unit
-        UMethod (name = A) [public fun A() = UastEmptyExpression]
-        UMethod (name = inlineFoo) [public fun inlineFoo() : void {...}]
+        UMethod (name = inlineFoo) [public final fun inlineFoo() : void {...}]
             UBlockExpression [{...}] : PsiType:Unit
+        UMethod (name = A) [public fun A() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.fe10.txt
deleted file mode 100644
index 53a536269b96..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.fe10.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-UFile (package = ) [public final class AnnotatedTypesKt {...]
-    UClass (name = AnnotatedTypesKt) [public final class AnnotatedTypesKt {...}]
-        UMethod (name = foo) [public static final fun foo(@org.jetbrains.annotations.NotNull list: java.util.List<java.lang.String>) : void {...}]
-            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<java.lang.String>]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Undetermined
-                UDeclarationsExpression [var a: java.lang.String = list[2]] = Undetermined
-                    ULocalVariable (name = a) [var a: java.lang.String = list[2]]
-                        UArrayAccessExpression [list[2]] = Undetermined
-                            USimpleNameReferenceExpression (identifier = list) [list] = Undetermined
-                            ULiteralExpression (value = 2) [2] = 2
-                UDeclarationsExpression [var b: java.lang.String = "abc"] = Undetermined
-                    ULocalVariable (name = b) [var b: java.lang.String = "abc"]
-                        ULiteralExpression (value = "abc") ["abc"] = "abc"
-                UDeclarationsExpression [var c: java.lang.String = b] = Undetermined
-                    ULocalVariable (name = c) [var c: java.lang.String = b]
-                        USimpleNameReferenceExpression (identifier = b) [b] = (var b = "abc")
-                UDeclarationsExpression [var v: java.lang.String = "abc"] = Undetermined
-                    ULocalVariable (name = v) [var v: java.lang.String = "abc"]
-                        ULiteralExpression (value = "abc") ["abc"] = "abc"
-    UClass (name = MyAnnotation) [public abstract annotation MyAnnotation {...}]
-        UAnnotation (fqName = kotlin.annotation.Target) [@kotlin.annotation.Target(allowedTargets = AnnotationTarget.TYPE)]
-            UNamedExpression (name = allowedTargets) [allowedTargets = AnnotationTarget.TYPE] = Undetermined
-                UQualifiedReferenceExpression [AnnotationTarget.TYPE] = Undetermined
-                    USimpleNameReferenceExpression (identifier = AnnotationTarget) [AnnotationTarget] = Undetermined
-                    USimpleNameReferenceExpression (identifier = TYPE) [TYPE] = Undetermined
-        UAnnotationMethod (name = a) [public abstract fun a() : int = UastEmptyExpression]
-        UAnnotationMethod (name = b) [public abstract fun b() : java.lang.String = UastEmptyExpression]
-        UAnnotationMethod (name = c) [public abstract fun c() : kotlin.annotation.AnnotationTarget = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.txt
new file mode 100644
index 000000000000..fb2f0b1b7c51
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/AnnotatedTypes.values.txt
@@ -0,0 +1,29 @@
+UFile (package = ) [public final class AnnotatedTypesKt {...]
+    UClass (name = AnnotatedTypesKt) [public final class AnnotatedTypesKt {...}]
+        UMethod (name = foo) [public static final fun foo(@org.jetbrains.annotations.NotNull list: java.util.List<java.lang.String>) : void {...}]
+            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<java.lang.String>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Undetermined
+                UDeclarationsExpression [var a: java.lang.String = list[2]] = Undetermined
+                    ULocalVariable (name = a) [var a: java.lang.String = list[2]]
+                        UArrayAccessExpression [list[2]] = Undetermined
+                            USimpleNameReferenceExpression (identifier = list) [list] = Undetermined
+                            ULiteralExpression (value = 2) [2] = 2
+                UDeclarationsExpression [var b: java.lang.String = "abc"] = Undetermined
+                    ULocalVariable (name = b) [var b: java.lang.String = "abc"]
+                        ULiteralExpression (value = "abc") ["abc"] = "abc"
+                UDeclarationsExpression [var c: java.lang.String = b] = Undetermined
+                    ULocalVariable (name = c) [var c: java.lang.String = b]
+                        USimpleNameReferenceExpression (identifier = b) [b] = (var b = "abc")
+                UDeclarationsExpression [var v: java.lang.String = "abc"] = Undetermined
+                    ULocalVariable (name = v) [var v: java.lang.String = "abc"]
+                        ULiteralExpression (value = "abc") ["abc"] = "abc"
+    UClass (name = MyAnnotation) [public abstract annotation MyAnnotation {...}]
+        UAnnotation (fqName = kotlin.annotation.Target) [@kotlin.annotation.Target(allowedTargets = AnnotationTarget.TYPE)]
+            UNamedExpression (name = allowedTargets) [allowedTargets = AnnotationTarget.TYPE] = Undetermined
+                UQualifiedReferenceExpression [AnnotationTarget.TYPE] = Undetermined
+                    USimpleNameReferenceExpression (identifier = AnnotationTarget) [AnnotationTarget] = Undetermined
+                    USimpleNameReferenceExpression (identifier = TYPE) [TYPE] = Undetermined
+        UAnnotationMethod (name = a) [public abstract fun a() : int = UastEmptyExpression]
+        UAnnotationMethod (name = b) [public abstract fun b() : java.lang.String = UastEmptyExpression]
+        UAnnotationMethod (name = c) [public abstract fun c() : kotlin.annotation.AnnotationTarget = UastEmptyExpression]
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/BrokenDataClass.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/BrokenDataClass.values.fir.txt
new file mode 100644
index 000000000000..565ea5396d44
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/BrokenDataClass.values.fir.txt
@@ -0,0 +1,21 @@
+UFile (package = ) [public final class Cls : <ErrorType> {...]
+    UClass (name = Cls) [public final class Cls : <ErrorType> {...}]
+        UField (name = a) [@org.jetbrains.annotations.NotNull private final var a: long]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = getA) [public final fun getA() : long = UastEmptyExpression]
+        UMethod (name = Cls) [public fun Cls(@org.jetbrains.annotations.NotNull a: long, @org.jetbrains.annotations.NotNull b: long) {...}]
+            UParameter (name = a) [@org.jetbrains.annotations.NotNull var a: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = b) [@org.jetbrains.annotations.NotNull var b: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = external <anonymous class>(a, a, a)(Undetermined, Undetermined, Undetermined)
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) [<anonymous class>(a, a, a)] = external <anonymous class>(a, a, a)(Undetermined, Undetermined, Undetermined)
+                    UIdentifier (Identifier (this)) [UIdentifier (Identifier (this))]
+                    USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(a, a, a)(Undetermined, Undetermined, Undetermined)
+                    USimpleNameReferenceExpression (identifier = a) [a] = Undetermined
+                    USimpleNameReferenceExpression (identifier = a) [a] = Undetermined
+                    USimpleNameReferenceExpression (identifier = a) [a] = Undetermined
+        UMethod (name = component1) [public final fun component1() : long = UastEmptyExpression]
+        UMethod (name = copy) [public final fun copy(@org.jetbrains.annotations.NotNull a: long) : Cls = UastEmptyExpression]
+            UParameter (name = a) [@org.jetbrains.annotations.NotNull var a: long]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fe10.txt
index f452310f6464..ab0b1ee93993 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fe10.txt
@@ -77,3 +77,7 @@ UFile (package = ) [public final class CommentOwnersKt {...]
             UAnnotation (fqName = null) [@null]
             USimpleNameReferenceExpression (identifier = MyBooleanEnum) [MyBooleanEnum] = external MyBooleanEnum()
         UMethod (name = MyBooleanEnum) [private fun MyBooleanEnum() = UastEmptyExpression]
+        UMethod (name = values) [public static fun values() : MyBooleanEnum[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : MyBooleanEnum = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fir.txt
index 3e01827694c9..a6b28bba499d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/CommentOwners.values.fir.txt
@@ -77,3 +77,7 @@ UFile (package = ) [public final class CommentOwnersKt {...]
             UAnnotation (fqName = null) [@null]
             USimpleNameReferenceExpression (identifier = MyBooleanEnum) [MyBooleanEnum] = external MyBooleanEnum()
         UMethod (name = MyBooleanEnum) [private fun MyBooleanEnum() = UastEmptyExpression]
+        UMethod (name = values) [public static fun values() : MyBooleanEnum[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : MyBooleanEnum = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fe10.txt
deleted file mode 100644
index 1e2d5bdd8445..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fe10.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-UFile (package = ) [public final class MyColor {...]
-    UClass (name = MyColor) [public final class MyColor {...}]
-        UField (name = x) [@org.jetbrains.annotations.NotNull private final var x: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UField (name = y) [@org.jetbrains.annotations.NotNull private final var y: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UField (name = z) [@org.jetbrains.annotations.NotNull private final var z: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UMethod (name = getX) [public final fun getX() : int = UastEmptyExpression]
-        UMethod (name = getY) [public final fun getY() : int = UastEmptyExpression]
-        UMethod (name = getZ) [public final fun getZ() : int = UastEmptyExpression]
-        UMethod (name = MyColor) [public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression]
-            UParameter (name = x) [@org.jetbrains.annotations.NotNull var x: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = y) [@org.jetbrains.annotations.NotNull var y: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-    UClass (name = Some) [public final class Some {...}]
-        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return <init>(18, 2, 3)
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return <init>(18, 2, 3)
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return <init>(18, 2, 3)] = Nothing
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(18, 2, 3)] = external <init>(18, 2, 3)(18, 2, 3)
-                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(18, 2, 3)(18, 2, 3)
-                                ULiteralExpression (value = 18) [18] = 18
-                                ULiteralExpression (value = 2) [2] = 2
-                                ULiteralExpression (value = 3) [3] = 3
-        UField (name = lambda) [@org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({ ...})]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return <init>(1, 2, 3)
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return <init>(1, 2, 3)
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return <init>(1, 2, 3)] = Nothing
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
-                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
-                                ULiteralExpression (value = 1) [1] = 1
-                                ULiteralExpression (value = 2) [2] = 2
-                                ULiteralExpression (value = 3) [3] = 3
-        UField (name = nonLazy) [@org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
-                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
-                ULiteralExpression (value = 1) [1] = 1
-                ULiteralExpression (value = 2) [2] = 2
-                ULiteralExpression (value = 3) [3] = 3
-        UMethod (name = getDelegate) [public final fun getDelegate() : MyColor = UastEmptyExpression]
-        UMethod (name = getLambda) [public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression]
-        UMethod (name = getNonLazy) [public final fun getNonLazy() : MyColor = UastEmptyExpression]
-        UMethod (name = Some) [public fun Some() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fir.txt
deleted file mode 100644
index 4b86a1a999d0..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.fir.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-UFile (package = ) [public final class MyColor {...]
-    UClass (name = MyColor) [public final class MyColor {...}]
-        UField (name = x) [@org.jetbrains.annotations.NotNull private final var x: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UField (name = y) [@org.jetbrains.annotations.NotNull private final var y: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UField (name = z) [@org.jetbrains.annotations.NotNull private final var z: int]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-        UMethod (name = getX) [public final fun getX() : int = UastEmptyExpression]
-        UMethod (name = getY) [public final fun getY() : int = UastEmptyExpression]
-        UMethod (name = getZ) [public final fun getZ() : int = UastEmptyExpression]
-        UMethod (name = MyColor) [public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression]
-            UParameter (name = x) [@org.jetbrains.annotations.NotNull var x: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = y) [@org.jetbrains.annotations.NotNull var y: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-    UClass (name = Some) [public final class Some {...}]
-        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<MyColor>]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return <init>(18, 2, 3)
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return <init>(18, 2, 3)
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return <init>(18, 2, 3)] = Nothing
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(18, 2, 3)] = external <init>(18, 2, 3)(18, 2, 3)
-                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(18, 2, 3)(18, 2, 3)
-                                ULiteralExpression (value = 18) [18] = 18
-                                ULiteralExpression (value = 2) [2] = 2
-                                ULiteralExpression (value = 3) [3] = 3
-        UField (name = lambda) [@org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({ ...})]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return <init>(1, 2, 3)
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return <init>(1, 2, 3)
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return <init>(1, 2, 3)] = Nothing
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
-                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
-                                ULiteralExpression (value = 1) [1] = 1
-                                ULiteralExpression (value = 2) [2] = 2
-                                ULiteralExpression (value = 3) [3] = 3
-        UField (name = nonLazy) [@org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
-                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
-                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
-                ULiteralExpression (value = 1) [1] = 1
-                ULiteralExpression (value = 2) [2] = 2
-                ULiteralExpression (value = 3) [3] = 3
-        UMethod (name = getDelegate) [public final fun getDelegate() : MyColor = UastEmptyExpression]
-        UMethod (name = getLambda) [public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression]
-        UMethod (name = getNonLazy) [public final fun getNonLazy() : MyColor = UastEmptyExpression]
-        UMethod (name = Some) [public fun Some() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.txt
new file mode 100644
index 000000000000..67e2db6f3b2c
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Delegate.values.txt
@@ -0,0 +1,67 @@
+UFile (package = ) [public final class MyColor {...]
+    UClass (name = MyColor) [public final class MyColor {...}]
+        UField (name = x) [@org.jetbrains.annotations.NotNull private final var x: int]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UField (name = y) [@org.jetbrains.annotations.NotNull private final var y: int]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UField (name = z) [@org.jetbrains.annotations.NotNull private final var z: int]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = getX) [public final fun getX() : int = UastEmptyExpression]
+        UMethod (name = getY) [public final fun getY() : int = UastEmptyExpression]
+        UMethod (name = getZ) [public final fun getZ() : int = UastEmptyExpression]
+        UMethod (name = MyColor) [public fun MyColor(@org.jetbrains.annotations.NotNull x: int, @org.jetbrains.annotations.NotNull y: int, @org.jetbrains.annotations.NotNull z: int) = UastEmptyExpression]
+            UParameter (name = x) [@org.jetbrains.annotations.NotNull var x: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = y) [@org.jetbrains.annotations.NotNull var y: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+    UClass (name = Some) [public final class Some {...}]
+        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
+    return <init>(18, 2, 3)
+})(Undetermined)
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
+    return <init>(18, 2, 3)
+})(Undetermined)
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Nothing
+                        UReturnExpression [return <init>(18, 2, 3)] = Nothing
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(18, 2, 3)] = external <init>(18, 2, 3)(18, 2, 3)
+                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(18, 2, 3)(18, 2, 3)
+                                ULiteralExpression (value = 18) [18] = 18
+                                ULiteralExpression (value = 2) [2] = 2
+                                ULiteralExpression (value = 3) [3] = 3
+        UField (name = lambda) [@org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({ ...})]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
+    return <init>(1, 2, 3)
+})(Undetermined)
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
+    return <init>(1, 2, 3)
+})(Undetermined)
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Nothing
+                        UReturnExpression [return <init>(1, 2, 3)] = Nothing
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
+                                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
+                                ULiteralExpression (value = 1) [1] = 1
+                                ULiteralExpression (value = 2) [2] = 2
+                                ULiteralExpression (value = 3) [3] = 3
+        UField (name = nonLazy) [@org.jetbrains.annotations.NotNull private final var nonLazy: MyColor = <init>(1, 2, 3)]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 3)) [<init>(1, 2, 3)] = external <init>(1, 2, 3)(1, 2, 3)
+                UIdentifier (Identifier (MyColor)) [UIdentifier (Identifier (MyColor))]
+                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: MyColor) [<init>] = external <init>(1, 2, 3)(1, 2, 3)
+                ULiteralExpression (value = 1) [1] = 1
+                ULiteralExpression (value = 2) [2] = 2
+                ULiteralExpression (value = 3) [3] = 3
+        UMethod (name = getDelegate) [public final fun getDelegate() : MyColor = UastEmptyExpression]
+        UMethod (name = getLambda) [public final fun getLambda() : kotlin.Lazy<MyColor> = UastEmptyExpression]
+        UMethod (name = getNonLazy) [public final fun getNonLazy() : MyColor = UastEmptyExpression]
+        UMethod (name = Some) [public fun Some() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fe10.txt
deleted file mode 100644
index a62b82566d82..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fe10.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-UFile (package = test.pkg) [package test.pkg...]
-    UClass (name = Test) [public final class Test {...}]
-        UMethod (name = test1) [public final fun test1() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = Test) [public fun Test() = UastEmptyExpression]
-        UMethod (name = test2) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")...}]
-            UAnnotation (fqName = kotlin.Deprecated) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")]
-                UNamedExpression (name = level) [level = DeprecationLevel.HIDDEN] = Undetermined
-                    UQualifiedReferenceExpression [DeprecationLevel.HIDDEN] = HIDDEN (enum entry)
-                        USimpleNameReferenceExpression (identifier = DeprecationLevel) [DeprecationLevel] = external DeprecationLevel()
-                        USimpleNameReferenceExpression (identifier = HIDDEN) [HIDDEN] = HIDDEN (enum entry)
-                UNamedExpression (name = message) [message = "nothing"] = Undetermined
-                    ULiteralExpression (value = "nothing") ["nothing"] = "nothing"
-            UBlockExpression [{...}] = Undetermined
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fir.txt
deleted file mode 100644
index 57373a156268..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.fir.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-UFile (package = test.pkg) [package test.pkg...]
-    UClass (name = Test) [public final class Test {...}]
-        UMethod (name = test1) [public final fun test1() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = Test) [public fun Test() = UastEmptyExpression]
-        UMethod (name = test2) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")...}]
-            UAnnotation (fqName = kotlin.Deprecated) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")]
-                UNamedExpression (name = level) [level = DeprecationLevel.HIDDEN] = Undetermined
-                    UQualifiedReferenceExpression [DeprecationLevel.HIDDEN] = external HIDDEN()
-                        USimpleNameReferenceExpression (identifier = DeprecationLevel) [DeprecationLevel] = external DeprecationLevel()
-                        USimpleNameReferenceExpression (identifier = HIDDEN) [HIDDEN] = external HIDDEN()
-                UNamedExpression (name = message) [message = "nothing"] = Undetermined
-                    ULiteralExpression (value = "nothing") ["nothing"] = "nothing"
-            UBlockExpression [{...}] = Undetermined
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.txt
new file mode 100644
index 000000000000..669dcfa3b92f
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/DeprecatedHidden.values.txt
@@ -0,0 +1,14 @@
+UFile (package = test.pkg) [package test.pkg...]
+    UClass (name = Test) [public final class Test {...}]
+        UMethod (name = test1) [public final fun test1() : void {...}]
+            UBlockExpression [{...}] = Undetermined
+        UMethod (name = Test) [public fun Test() = UastEmptyExpression]
+        UMethod (name = test2) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")...}]
+            UAnnotation (fqName = kotlin.Deprecated) [@kotlin.Deprecated(level = DeprecationLevel.HIDDEN, message = "nothing")]
+                UNamedExpression (name = level) [level = DeprecationLevel.HIDDEN] = Undetermined
+                    UQualifiedReferenceExpression [DeprecationLevel.HIDDEN] = HIDDEN (enum entry)
+                        USimpleNameReferenceExpression (identifier = DeprecationLevel) [DeprecationLevel] = external DeprecationLevel()
+                        USimpleNameReferenceExpression (identifier = HIDDEN) [HIDDEN] = HIDDEN (enum entry)
+                UNamedExpression (name = message) [message = "nothing"] = Undetermined
+                    ULiteralExpression (value = "nothing") ["nothing"] = "nothing"
+            UBlockExpression [{...}] = Undetermined
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fe10.txt
index d6e535b54737..23b0ba198eae 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fe10.txt
@@ -17,3 +17,7 @@ UFile (package = ) [public enum Style {...]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.NotNull var value: java.lang.String]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fir.txt
index 0772ae4e624b..bb0404c651e4 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValueMembers.values.fir.txt
@@ -17,3 +17,7 @@ UFile (package = ) [public final enum Style {...]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.NotNull var value: java.lang.String]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fe10.txt
index 4410c1376d23..985a3b33a6b0 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fe10.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fe10.txt
@@ -22,3 +22,7 @@ UFile (package = ) [public enum Style {...]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.Nullable var value: java.lang.String]
                 UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fir.txt
index 8967f612769b..dfa1bbd5cb77 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/EnumValuesConstructors.values.fir.txt
@@ -22,3 +22,7 @@ UFile (package = ) [public final enum Style {...]
         UMethod (name = Style) [private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression]
             UParameter (name = value) [@org.jetbrains.annotations.Nullable var value: java.lang.String]
                 UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+        UMethod (name = values) [public static fun values() : Style[] = UastEmptyExpression]
+        UMethod (name = valueOf) [public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression]
+            UParameter (name = name) [@org.jetbrains.annotations.NotNull var name: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/LambdaReturn.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/LambdaReturn.values.fir.txt
index 4e374ae2e100..3f82136ea74b 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/LambdaReturn.values.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/LambdaReturn.values.fir.txt
@@ -141,8 +141,8 @@ UFile (package = org.jetbrains.uast.kotlin) [package org.jetbrains.uast.kotlin..
                                     UIdentifier (Identifier (listOf)) [UIdentifier (Identifier (listOf))]
                                     USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null) [listOf] = external listOf(1)(1)
                                     ULiteralExpression (value = 1) [1] = 1
-        UMethod (name = bar) [private static fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Integer>) : void {...}]
-            UParameter (name = lmbd) [@org.jetbrains.annotations.NotNull var lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,? extends java.lang.Integer>]
+        UMethod (name = bar) [private static final fun bar(@org.jetbrains.annotations.NotNull lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer>) : void {...}]
+            UParameter (name = lmbd) [@org.jetbrains.annotations.NotNull var lmbd: kotlin.jvm.functions.Function1<? super java.lang.Integer,java.lang.Integer>]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UBlockExpression [{...}] = external invoke(1)(1)
                 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [invoke(1)] = external invoke(1)(1)
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fe10.txt
deleted file mode 100644
index 2f7531c3b8a2..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fe10.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-UFile (package = ) [public final class PropertyDelegateKt {...]
-    UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}]
-        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return "/sdcard"] = Nothing
-                            ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
-        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UAnnotation (fqName = kotlin.Suppress) [@kotlin.Suppress]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return 1 + 1
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return 1 + 1
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return 1 + 1] = Nothing
-                            UBinaryExpression (operator = +) [1 + 1] = 2
-                                ULiteralExpression (value = 1) [1] = 1
-                                ULiteralExpression (value = 1) [1] = 1
-        UMethod (name = getSdCardPath) [public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression]
-        UMethod (name = localPropertyTest) [public static final fun localPropertyTest() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-                UDeclarationsExpression [var sdCardPathLocal: java.lang.String] = Undetermined
-                    ULocalVariable (name = sdCardPathLocal) [var sdCardPathLocal: java.lang.String]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                            UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                            USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                            ULambdaExpression [{ ...}] = Undetermined
-                                UBlockExpression [{...}] = Nothing
-                                    UReturnExpression [return "/sdcard"] = Nothing
-                                        ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
-        UMethod (name = getAnnotatedDelegate) [public static final fun getAnnotatedDelegate() : int = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fir.txt
deleted file mode 100644
index 22b6ef3f0af8..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.fir.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-UFile (package = ) [public final class PropertyDelegateKt {...]
-    UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}]
-        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<java.lang.String>]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return "/sdcard"] = Nothing
-                            ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
-        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<java.lang.Integer>]
-            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UAnnotation (fqName = kotlin.Suppress) [@kotlin.Suppress]
-            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return 1 + 1
-})(Undetermined)
-                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return 1 + 1
-})(Undetermined)
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Nothing
-                        UReturnExpression [return 1 + 1] = Nothing
-                            UBinaryExpression (operator = +) [1 + 1] = 2
-                                ULiteralExpression (value = 1) [1] = 1
-                                ULiteralExpression (value = 1) [1] = 1
-        UMethod (name = getSdCardPath) [public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression]
-        UMethod (name = localPropertyTest) [public static final fun localPropertyTest() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-                UDeclarationsExpression [var sdCardPathLocal: java.lang.String] = Undetermined
-                    ULocalVariable (name = sdCardPathLocal) [var sdCardPathLocal: java.lang.String]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                            UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
-                            USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
-    return "/sdcard"
-})(Undetermined)
-                            ULambdaExpression [{ ...}] = Undetermined
-                                UBlockExpression [{...}] = Nothing
-                                    UReturnExpression [return "/sdcard"] = Nothing
-                                        ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
-        UMethod (name = getAnnotatedDelegate) [public static final fun getAnnotatedDelegate() : int = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.txt
new file mode 100644
index 000000000000..e2ae2c9fcb5a
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/PropertyDelegate.values.txt
@@ -0,0 +1,48 @@
+UFile (package = ) [public final class PropertyDelegateKt {...]
+    UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}]
+        UField (name = sdCardPath$delegate) [@org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<? extends java.lang.String>]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
+    return "/sdcard"
+})(Undetermined)
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
+    return "/sdcard"
+})(Undetermined)
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Nothing
+                        UReturnExpression [return "/sdcard"] = Nothing
+                            ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
+        UField (name = annotatedDelegate$delegate) [@org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<? extends java.lang.Integer>]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UAnnotation (fqName = kotlin.Suppress) [@kotlin.Suppress]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
+    return 1 + 1
+})(Undetermined)
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
+    return 1 + 1
+})(Undetermined)
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Nothing
+                        UReturnExpression [return 1 + 1] = Nothing
+                            UBinaryExpression (operator = +) [1 + 1] = 2
+                                ULiteralExpression (value = 1) [1] = 1
+                                ULiteralExpression (value = 1) [1] = 1
+        UMethod (name = getSdCardPath) [public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression]
+        UMethod (name = localPropertyTest) [public static final fun localPropertyTest() : void {...}]
+            UBlockExpression [{...}] = Undetermined
+                UDeclarationsExpression [var sdCardPathLocal: java.lang.String] = Undetermined
+                    ULocalVariable (name = sdCardPathLocal) [var sdCardPathLocal: java.lang.String]
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
+    return "/sdcard"
+})(Undetermined)
+                            UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                            USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] = external lazy({
+    return "/sdcard"
+})(Undetermined)
+                            ULambdaExpression [{ ...}] = Undetermined
+                                UBlockExpression [{...}] = Nothing
+                                    UReturnExpression [return "/sdcard"] = Nothing
+                                        ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard"
+        UMethod (name = getAnnotatedDelegate) [public static final fun getAnnotatedDelegate() : int = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fe10.txt
deleted file mode 100644
index 59fa2df3462f..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fe10.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-UFile (package = test.pkg) [package test.pkg...]
-    UClass (name = ReifiedKt) [public final class ReifiedKt {...}]
-        UMethod (name = systemService2) [public static final fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : error.NonExistentClass {...}]
-            UParameter (name = $this$systemService2) [@org.jetbrains.annotations.NotNull var $this$systemService2: test.pkg.Context]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
-                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
-                            UClassLiteralExpression [java.lang.String] = java.lang.String
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-        UMethod (name = systemService1) [public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {...}]
-            UParameter (name = $this$systemService1) [@org.jetbrains.annotations.NotNull var $this$systemService1: test.pkg.Context]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(T.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
-                        UQualifiedReferenceExpression [T.java] = external java()
-                            UClassLiteralExpression [T] = T
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-    UClass (name = Context) [public final class Context {...}]
-        UMethod (name = ownSystemService2) [public final fun ownSystemService2() : error.NonExistentClass {...}]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
-                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
-                            UClassLiteralExpression [java.lang.String] = java.lang.String
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-        UMethod (name = Context) [public fun Context() = UastEmptyExpression]
-        UMethod (name = ownSystemService1) [public fun ownSystemService1() : <ErrorType> {...}]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(T.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
-                        UQualifiedReferenceExpression [T.java] = external java()
-                            UClassLiteralExpression [T] = T
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fir.txt
deleted file mode 100644
index 1ee14ec3afed..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.fir.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-UFile (package = test.pkg) [package test.pkg...]
-    UClass (name = ReifiedKt) [public final class ReifiedKt {...}]
-        UMethod (name = systemService1) [public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {...}]
-            UParameter (name = $this$systemService1) [@org.jetbrains.annotations.NotNull var $this$systemService1: test.pkg.Context]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(T.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
-                        UQualifiedReferenceExpression [T.java] = external java()
-                            UClassLiteralExpression [T] = T
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-        UMethod (name = systemService2) [public static fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : <ErrorType> {...}]
-            UParameter (name = $this$systemService2) [@org.jetbrains.annotations.NotNull var $this$systemService2: test.pkg.Context]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
-                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
-                            UClassLiteralExpression [java.lang.String] = java.lang.String
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-    UClass (name = Context) [public final class Context {...}]
-        UMethod (name = Context) [public fun Context() = UastEmptyExpression]
-        UMethod (name = ownSystemService1) [public fun ownSystemService1() : <ErrorType> {...}]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(T.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
-                        UQualifiedReferenceExpression [T.java] = external java()
-                            UClassLiteralExpression [T] = T
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
-        UMethod (name = ownSystemService2) [public fun ownSystemService2() : <ErrorType> {...}]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
-                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
-                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
-                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
-                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
-                            UClassLiteralExpression [java.lang.String] = java.lang.String
-                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.txt
new file mode 100644
index 000000000000..5e662e415286
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Reified.values.txt
@@ -0,0 +1,44 @@
+UFile (package = test.pkg) [package test.pkg...]
+    UClass (name = ReifiedKt) [public final class ReifiedKt {...}]
+        UMethod (name = systemService2) [public static final fun systemService2(@org.jetbrains.annotations.NotNull $this$systemService2: test.pkg.Context) : error.NonExistentClass {...}]
+            UParameter (name = $this$systemService2) [@org.jetbrains.annotations.NotNull var $this$systemService2: test.pkg.Context]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
+                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
+                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
+                            UClassLiteralExpression [java.lang.String] = java.lang.String
+                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
+        UMethod (name = systemService1) [public static fun systemService1(@org.jetbrains.annotations.NotNull $this$systemService1: test.pkg.Context) : <ErrorType> {...}]
+            UParameter (name = $this$systemService1) [@org.jetbrains.annotations.NotNull var $this$systemService1: test.pkg.Context]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return <anonymous class>(T.java)] = Nothing
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
+                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
+                        UQualifiedReferenceExpression [T.java] = external java()
+                            UClassLiteralExpression [T] = T
+                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
+    UClass (name = Context) [public final class Context {...}]
+        UMethod (name = ownSystemService2) [public final fun ownSystemService2() : error.NonExistentClass {...}]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return <anonymous class>(java.lang.String.java)] = Nothing
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(java.lang.String.java)] = external <anonymous class>(java.lang.String.java)(external java())
+                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(java.lang.String.java)(external java())
+                        UQualifiedReferenceExpression [java.lang.String.java] = external java()
+                            UClassLiteralExpression [java.lang.String] = java.lang.String
+                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
+        UMethod (name = Context) [public fun Context() = UastEmptyExpression]
+        UMethod (name = ownSystemService1) [public fun ownSystemService1() : <ErrorType> {...}]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return <anonymous class>(T.java)] = Nothing
+                    UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [<anonymous class>(T.java)] = external <anonymous class>(T.java)(external java())
+                        UIdentifier (Identifier (getSystemService)) [UIdentifier (Identifier (getSystemService))]
+                        USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null) [<anonymous class>] = external <anonymous class>(T.java)(external java())
+                        UQualifiedReferenceExpression [T.java] = external java()
+                            UClassLiteralExpression [T] = T
+                            USimpleNameReferenceExpression (identifier = java) [java] = external java()
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fe10.txt
deleted file mode 100644
index fc307df80c80..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fe10.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-UFile (package = ) [public final class ReifiedResolveKt {...]
-    UClass (name = ReifiedResolveKt) [public final class ReifiedResolveKt {...}]
-        UMethod (name = bar) [public static final fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit>) : T {...}]
-            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit> = { ...}]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Undetermined
-            UBlockExpression [{...}] = external TODO("message")("message")
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
-                    ULiteralExpression (value = "message") ["message"] = "message"
-        UMethod (name = resolve) [public static final fun resolve() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
-                    UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
-                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
-                UDeclarationsExpression [var x: java.lang.String = foo()] = Undetermined
-                    ULocalVariable (name = x) [var x: java.lang.String = foo()]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
-                            UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
-                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
-                    UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
-                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
-                UDeclarationsExpression [var y: java.lang.String = bar()] = Undetermined
-                    ULocalVariable (name = y) [var y: java.lang.String = bar()]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
-                            UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
-                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
-                UDeclarationsExpression [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()] = Undetermined
-                    ULocalVariable (name = z) [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()]
-                        UQualifiedReferenceExpression [listOf("foo").filterIsInstance()] = external filterIsInstance()()
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [listOf("foo")] = external listOf("foo")("foo")
-                                UIdentifier (Identifier (listOf)) [UIdentifier (Identifier (listOf))]
-                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null) [listOf] = external listOf("foo")("foo")
-                                ULiteralExpression (value = "foo") ["foo"] = "foo"
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [filterIsInstance()] = external filterIsInstance()()
-                                UIdentifier (Identifier (filterIsInstance)) [UIdentifier (Identifier (filterIsInstance))]
-                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null) [filterIsInstance] = external filterIsInstance()()
-        UMethod (name = foo) [public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {...}]
-            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> = { ...}]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Undetermined
-            UBlockExpression [{...}] = external TODO("message")("message")
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
-                    ULiteralExpression (value = "message") ["message"] = "message"
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fir.txt
deleted file mode 100644
index 8b21a39d1aa4..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.fir.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-UFile (package = ) [public final class ReifiedResolveKt {...]
-    UClass (name = ReifiedResolveKt) [public final class ReifiedResolveKt {...}]
-        UMethod (name = resolve) [public static final fun resolve() : void {...}]
-            UBlockExpression [{...}] = Undetermined
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
-                    UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
-                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
-                UDeclarationsExpression [var x: java.lang.String = foo()] = Undetermined
-                    ULocalVariable (name = x) [var x: java.lang.String = foo()]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
-                            UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
-                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
-                    UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
-                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
-                UDeclarationsExpression [var y: java.lang.String = bar()] = Undetermined
-                    ULocalVariable (name = y) [var y: java.lang.String = bar()]
-                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
-                            UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
-                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
-                UDeclarationsExpression [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()] = Undetermined
-                    ULocalVariable (name = z) [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()]
-                        UQualifiedReferenceExpression [listOf("foo").filterIsInstance()] = external filterIsInstance()()
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [listOf("foo")] = external listOf("foo")("foo")
-                                UIdentifier (Identifier (listOf)) [UIdentifier (Identifier (listOf))]
-                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null) [listOf] = external listOf("foo")("foo")
-                                ULiteralExpression (value = "foo") ["foo"] = "foo"
-                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [filterIsInstance()] = external filterIsInstance()()
-                                UIdentifier (Identifier (filterIsInstance)) [UIdentifier (Identifier (filterIsInstance))]
-                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null) [filterIsInstance] = external filterIsInstance()()
-        UMethod (name = foo) [public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {...}]
-            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> = { ...}]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Undetermined
-            UBlockExpression [{...}] = external TODO("message")("message")
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
-                    ULiteralExpression (value = "message") ["message"] = "message"
-        UMethod (name = bar) [public static fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {...}]
-            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> = { ...}]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-                ULambdaExpression [{ ...}] = Undetermined
-                    UBlockExpression [{...}] = Undetermined
-            UBlockExpression [{...}] = external TODO("message")("message")
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
-                    ULiteralExpression (value = "message") ["message"] = "message"
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.txt
new file mode 100644
index 000000000000..c50d09b9362b
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedResolve.values.txt
@@ -0,0 +1,50 @@
+UFile (package = ) [public final class ReifiedResolveKt {...]
+    UClass (name = ReifiedResolveKt) [public final class ReifiedResolveKt {...}]
+        UMethod (name = bar) [public static final fun bar(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit>) : T {...}]
+            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,kotlin.Unit> = { ...}]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Undetermined
+            UBlockExpression [{...}] = external TODO("message")("message")
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
+                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
+                    ULiteralExpression (value = "message") ["message"] = "message"
+        UMethod (name = resolve) [public static final fun resolve() : void {...}]
+            UBlockExpression [{...}] = Undetermined
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
+                    UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
+                    USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
+                UDeclarationsExpression [var x: java.lang.String = foo()] = Undetermined
+                    ULocalVariable (name = x) [var x: java.lang.String = foo()]
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] = external foo()()
+                            UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
+                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] = external foo()()
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
+                    UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
+                    USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
+                UDeclarationsExpression [var y: java.lang.String = bar()] = Undetermined
+                    ULocalVariable (name = y) [var y: java.lang.String = bar()]
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [bar()] = external bar()()
+                            UIdentifier (Identifier (bar)) [UIdentifier (Identifier (bar))]
+                            USimpleNameReferenceExpression (identifier = bar, resolvesTo = null) [bar] = external bar()()
+                UDeclarationsExpression [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()] = Undetermined
+                    ULocalVariable (name = z) [var z: java.util.List<? extends java.lang.String> = listOf("foo").filterIsInstance()]
+                        UQualifiedReferenceExpression [listOf("foo").filterIsInstance()] = external filterIsInstance()()
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [listOf("foo")] = external listOf("foo")("foo")
+                                UIdentifier (Identifier (listOf)) [UIdentifier (Identifier (listOf))]
+                                USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null) [listOf] = external listOf("foo")("foo")
+                                ULiteralExpression (value = "foo") ["foo"] = "foo"
+                            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [filterIsInstance()] = external filterIsInstance()()
+                                UIdentifier (Identifier (filterIsInstance)) [UIdentifier (Identifier (filterIsInstance))]
+                                USimpleNameReferenceExpression (identifier = filterIsInstance, resolvesTo = null) [filterIsInstance] = external filterIsInstance()()
+        UMethod (name = foo) [public static fun foo(@org.jetbrains.annotations.NotNull init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit>) : T {...}]
+            UParameter (name = init) [@org.jetbrains.annotations.NotNull var init: kotlin.jvm.functions.Function1<? super T,? extends kotlin.Unit> = { ...}]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+                ULambdaExpression [{ ...}] = Undetermined
+                    UBlockExpression [{...}] = Undetermined
+            UBlockExpression [{...}] = external TODO("message")("message")
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [TODO("message")] = external TODO("message")("message")
+                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO("message")("message")
+                    ULiteralExpression (value = "message") ["message"] = "message"
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fe10.txt
deleted file mode 100644
index 6b65931e6be7..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fe10.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = ) [public final class ReifiedReturnTypeKt {...]
-    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
-        UMethod (name = function1) [public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = function2) [public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function2CharSequence) [public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
-            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return threshold2] = Nothing
-                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] = Undetermined
-        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return 42] = Nothing
-                    ULiteralExpression (value = 42) [42] = 42
-        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
-            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-    UClass (name = Foo) [public final class Foo {...}]
-        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
-        UMethod (name = foo) [public fun foo() : Z {...}]
-            UBlockExpression [{...}] = external TODO()()
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] = external TODO()()
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO()()
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt
deleted file mode 100644
index dc8774104e19..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-UFile (package = ) [public final class ReifiedReturnTypeKt {...]
-    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
-        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
-            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return threshold2] = Nothing
-                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] = Undetermined
-        UMethod (name = function1) [public static fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = function2) [public static fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function2CharSequence) [public static fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Undetermined
-        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return 42] = Nothing
-                    ULiteralExpression (value = 42) [42] = 42
-        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
-            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
-            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
-                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
-            UBlockExpression [{...}] = Nothing
-                UReturnExpression [return t] = Nothing
-                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
-    UClass (name = Foo) [public final class Foo {...}]
-        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
-        UMethod (name = foo) [public fun foo() : Z {...}]
-            UBlockExpression [{...}] = external TODO()()
-                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] = external TODO()()
-                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
-                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO()()
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.txt
new file mode 100644
index 000000000000..f45858a8395a
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.txt
@@ -0,0 +1,163 @@
+UFile (package = ) [public final class ReifiedReturnTypeKt {...]
+    UClass (name = ReifiedReturnTypeKt) [public final class ReifiedReturnTypeKt {...}]
+        UMethod (name = function1) [public static final fun function1(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Undetermined
+        UMethod (name = function2) [public static final fun function2(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function2CharSequence) [public static final fun function2CharSequence(@org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = copyWhenGreater) [public static final fun copyWhenGreater(@org.jetbrains.annotations.NotNull list: java.util.List<? extends T>, @org.jetbrains.annotations.NotNull threshold: T, @org.jetbrains.annotations.NotNull threshold2: B) : B {...}]
+            UParameter (name = list) [@org.jetbrains.annotations.NotNull var list: java.util.List<? extends T>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = threshold) [@org.jetbrains.annotations.NotNull var threshold: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = threshold2) [@org.jetbrains.annotations.NotNull var threshold2: B]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return threshold2] = Nothing
+                    USimpleNameReferenceExpression (identifier = threshold2) [threshold2] = Undetermined
+        UMethod (name = function3) [public static fun function3(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : void {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Undetermined
+        UMethod (name = function4) [public static fun function4(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function5) [public static fun function5(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : int {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return 42] = Nothing
+                    ULiteralExpression (value = 42) [42] = 42
+        UMethod (name = function6) [public static fun function6(@org.jetbrains.annotations.Nullable $this$function6: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function6) [@org.jetbrains.annotations.Nullable var $this$function6: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function7) [public static fun function7(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function8) [private static fun function8(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function9) [public static fun function9(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function10) [public static fun function10(@org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function11) [public static fun function11(@org.jetbrains.annotations.Nullable $this$function11: T, @org.jetbrains.annotations.Nullable t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function11) [@org.jetbrains.annotations.Nullable var $this$function11: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = t) [@org.jetbrains.annotations.Nullable var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.Nullable) [@org.jetbrains.annotations.Nullable]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function11CharSequence) [public static fun function11CharSequence(@org.jetbrains.annotations.NotNull $this$function11CharSequence: T, @org.jetbrains.annotations.NotNull t: T, @org.jetbrains.annotations.NotNull i: int, @org.jetbrains.annotations.NotNull s: java.lang.String) : T {...}]
+            UParameter (name = $this$function11CharSequence) [@org.jetbrains.annotations.NotNull var $this$function11CharSequence: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+        UMethod (name = function12CharSequence) [public static fun function12CharSequence(@org.jetbrains.annotations.NotNull $this$function12CharSequence: T, @org.jetbrains.annotations.NotNull t: B, @org.jetbrains.annotations.NotNull i: T, @org.jetbrains.annotations.NotNull s: java.lang.String) : B {...}]
+            UParameter (name = $this$function12CharSequence) [@org.jetbrains.annotations.NotNull var $this$function12CharSequence: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = t) [@org.jetbrains.annotations.NotNull var t: B]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: T]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = s) [@org.jetbrains.annotations.NotNull var s: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] = Nothing
+                UReturnExpression [return t] = Nothing
+                    USimpleNameReferenceExpression (identifier = t) [t] = Undetermined
+    UClass (name = Foo) [public final class Foo {...}]
+        UMethod (name = Foo) [public fun Foo() = UastEmptyExpression]
+        UMethod (name = foo) [public fun foo() : Z {...}]
+            UBlockExpression [{...}] = external TODO()()
+                UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [TODO()] = external TODO()()
+                    UIdentifier (Identifier (TODO)) [UIdentifier (Identifier (TODO))]
+                    USimpleNameReferenceExpression (identifier = TODO, resolvesTo = null) [TODO] = external TODO()()
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt
index c694d4465d72..372c711c54af 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt
@@ -119,7 +119,7 @@ UFile (package = ) [public final class ResolveKt {...]
                             UTypeReferenceExpression (name = int) [int] = Undetermined
                 UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2)) [<init>(1, 2)] = external <init>(1, 2)(1, 2)
                     UIdentifier (Identifier (IntRange)) [UIdentifier (Identifier (IntRange))]
-                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = null) [<init>] = external <init>(1, 2)(1, 2)
+                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: IntRange) [<init>] = external <init>(1, 2)(1, 2)
                     ULiteralExpression (value = 1) [1] = 1
                     ULiteralExpression (value = 2) [2] = 2
         UMethod (name = barT) [public static final fun barT(@org.jetbrains.annotations.NotNull t: T) : void {...}]
@@ -151,6 +151,6 @@ UFile (package = ) [public final class ResolveKt {...]
     UClass (name = A) [public class A {...}]
         UMethod (name = foo) [public final fun foo() : void {...}]
             UBlockExpression [{...}] = Undetermined
-        UMethod (name = A) [public fun A() = UastEmptyExpression]
-        UMethod (name = inlineFoo) [public fun inlineFoo() : void {...}]
+        UMethod (name = inlineFoo) [public final fun inlineFoo() : void {...}]
             UBlockExpression [{...}] = Undetermined
+        UMethod (name = A) [public fun A() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/accessArrayOfInlineClass.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/accessArrayOfInlineClass.types.fir.txt
index 5998035e8fab..6dd46d29140d 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/accessArrayOfInlineClass.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/accessArrayOfInlineClass.types.fir.txt
@@ -8,39 +8,39 @@ UFile (package = ) [public final class AccessArrayOfInlineClassKt {...]
                 ULiteralExpression (value = 2) [2] : PsiType:int
                 ULambdaExpression [{ var it: int ->...}] : PsiType:Function1<? super Integer, ? extends Z>
                     UParameter (name = it) [var it: int]
-                    UBlockExpression [{...}] : PsiType:Z
+                    UBlockExpression [{...}] : PsiType:int
                         UReturnExpression [return <init>(42)]
-                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>(42)] : PsiType:Z
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>(42)] : PsiType:int
                                 UIdentifier (Identifier (Z)) [UIdentifier (Identifier (Z))]
-                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Z) [<init>] : PsiType:Z
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Z) [<init>] : PsiType:int
                                 ULiteralExpression (value = 42) [42] : PsiType:int
         UMethod (name = getXs) [public static final fun getXs() : Z[] = UastEmptyExpression]
         UMethod (name = box) [public static final fun box() : java.lang.String {...}]
             UBlockExpression [{...}] : PsiType:Void
                 UBinaryExpression (operator = =) [xs[0] = <init>(12)] : PsiType:Unit
-                    UArrayAccessExpression [xs[0]] : PsiType:Unit
+                    UArrayAccessExpression [xs[0]] : PsiType:int
                         USimpleNameReferenceExpression (identifier = xs) [xs] : PsiType:Z[]
                         ULiteralExpression (value = 0) [0] : PsiType:int
-                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>(12)] : PsiType:Z
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>(12)] : PsiType:int
                         UIdentifier (Identifier (Z)) [UIdentifier (Identifier (Z))]
-                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Z) [<init>] : PsiType:Z
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: Z) [<init>] : PsiType:int
                         ULiteralExpression (value = 12) [12] : PsiType:int
-                UDeclarationsExpression [var t: Z = xs[0]]
-                    ULocalVariable (name = t) [var t: Z = xs[0]]
-                        UArrayAccessExpression [xs[0]] : PsiType:Z
+                UDeclarationsExpression [var t: int = xs[0]]
+                    ULocalVariable (name = t) [var t: int = xs[0]]
+                        UArrayAccessExpression [xs[0]] : PsiType:int
                             USimpleNameReferenceExpression (identifier = xs) [xs] : PsiType:Z[]
                             ULiteralExpression (value = 0) [0] : PsiType:int
                 UIfExpression [if (t.data != 12) throw <init>(t)] : PsiType:Unit
                     UBinaryExpression (operator = !=) [t.data != 12] : PsiType:boolean
                         UQualifiedReferenceExpression [t.data] : PsiType:int
-                            USimpleNameReferenceExpression (identifier = t) [t] : PsiType:Z
+                            USimpleNameReferenceExpression (identifier = t) [t] : PsiType:int
                             USimpleNameReferenceExpression (identifier = data) [data] : PsiType:int
                         ULiteralExpression (value = 12) [12] : PsiType:int
                     UThrowExpression [throw <init>(t)] : PsiType:Void
                         UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>(t)] : PsiType:AssertionError
                             UIdentifier (Identifier (AssertionError)) [UIdentifier (Identifier (AssertionError))]
                             USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: AssertionError) [<init>] : PsiType:AssertionError
-                            USimpleNameReferenceExpression (identifier = t) [t] : PsiType:Z
+                            USimpleNameReferenceExpression (identifier = t) [t] : PsiType:int
                 UReturnExpression [return "OK"] : PsiType:Void
                     ULiteralExpression (value = "OK") ["OK"] : PsiType:String
     UClass (name = Z) [public final class Z {...}]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt
index 98d96ec9cd12..ef6276684fb5 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt
@@ -25,7 +25,7 @@ UFile (package = ) [public final class ArrayGetAssignMultiIndexKt {...]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UBlockExpression [{...}] : PsiType:Unit
                 UBinaryExpression (operator = =) [this[index1 + index2] = elem] : PsiType:Unit
-                    UArrayAccessExpression [this[index1 + index2]] : PsiType:Unit
+                    UArrayAccessExpression [this[index1 + index2]] : PsiType:String
                         UThisExpression (label = null) [this] : PsiType:String[]
                         UBinaryExpression (operator = +) [index1 + index2] : PsiType:int
                             USimpleNameReferenceExpression (identifier = index1) [index1] : PsiType:int
@@ -45,14 +45,14 @@ UFile (package = ) [public final class ArrayGetAssignMultiIndexKt {...]
                                     UReturnExpression [return ""]
                                         ULiteralExpression (value = "") [""] : PsiType:String
                 UBinaryExpression (operator = =) [s[1, --1] = "O"] : PsiType:Unit
-                    UArrayAccessExpression [s[1, --1]] : PsiType:Unit
+                    UArrayAccessExpression [s[1, --1]] : PsiType:String
                         USimpleNameReferenceExpression (identifier = s) [s] : PsiType:String[]
                         ULiteralExpression (value = 1) [1] : PsiType:int
                         UPrefixExpression (operator = -) [--1] : PsiType:int
                             ULiteralExpression (value = -1) [-1] : PsiType:int
                     ULiteralExpression (value = "O") ["O"] : PsiType:String
                 UBinaryExpression (operator = +=) [s[2, --2] += "K"] : PsiType:Unit
-                    UArrayAccessExpression [s[2, --2]] : PsiType:String
+                    UArrayAccessExpression [s[2, --2]] : PsiType:int
                         USimpleNameReferenceExpression (identifier = s) [s] : PsiType:String[]
                         ULiteralExpression (value = 2) [2] : PsiType:int
                         UPrefixExpression (operator = -) [--2] : PsiType:int
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.kt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.kt
new file mode 100644
index 000000000000..3dc89d177d40
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.kt
@@ -0,0 +1,12 @@
+interface I {
+    fun foo(): Int
+}
+
+class A
+
+fun box() : Int {
+    val o = object : I, A() {
+        override fun foo(): Int = 42
+    }
+    return o.foo()
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fe10.txt
new file mode 100644
index 000000000000..1d881133c8aa
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fe10.txt
@@ -0,0 +1,23 @@
+UFile (package = ) [public final class ObjectLiteralKt {...]
+    UClass (name = ObjectLiteralKt) [public final class ObjectLiteralKt {...}]
+        UMethod (name = box) [public static final fun box() : int {...}]
+            UBlockExpression [{...}] : PsiType:Void
+                UDeclarationsExpression [var o: <ErrorType> = anonymous object : I, A() {...    }]
+                    ULocalVariable (name = o) [var o: <ErrorType> = anonymous object : I, A() {...    }]
+                        UObjectLiteralExpression [anonymous object : I, A() {...    }] : PsiType:I
+                            UClass (name = null) [final class null : I, A {...}]
+                                UMethod (name = foo) [public fun foo() : int {...}]
+                                    UBlockExpression [{...}]
+                                        UReturnExpression [return 42]
+                                            ULiteralExpression (value = 42) [42] : PsiType:int
+                                UMethod (name = ) [private fun () = UastEmptyExpression]
+                UReturnExpression [return o.foo()] : PsiType:Void
+                    UQualifiedReferenceExpression [o.foo()] : PsiType:int
+                        USimpleNameReferenceExpression (identifier = o) [o] : PsiType:<ErrorType>
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] : PsiType:int
+                            UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
+                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] : PsiType:int
+    UClass (name = I) [public abstract interface I {...}]
+        UMethod (name = foo) [public abstract fun foo() : int = UastEmptyExpression]
+    UClass (name = A) [public final class A {...}]
+        UMethod (name = A) [public fun A() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fir.txt
new file mode 100644
index 000000000000..670b4779eb87
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/objectLiteral.types.fir.txt
@@ -0,0 +1,23 @@
+UFile (package = ) [public final class ObjectLiteralKt {...]
+    UClass (name = ObjectLiteralKt) [public final class ObjectLiteralKt {...}]
+        UMethod (name = box) [public static final fun box() : int {...}]
+            UBlockExpression [{...}] : PsiType:Void
+                UDeclarationsExpression [var o: A = anonymous object : I, A() {...    }]
+                    ULocalVariable (name = o) [var o: A = anonymous object : I, A() {...    }]
+                        UObjectLiteralExpression [anonymous object : I, A() {...    }] : PsiType:A
+                            UClass (name = null) [final class null : I, A {...}]
+                                UMethod (name = foo) [public fun foo() : int {...}]
+                                    UBlockExpression [{...}]
+                                        UReturnExpression [return 42]
+                                            ULiteralExpression (value = 42) [42] : PsiType:int
+                                UMethod (name = ) [private fun () = UastEmptyExpression]
+                UReturnExpression [return o.foo()] : PsiType:Void
+                    UQualifiedReferenceExpression [o.foo()] : PsiType:int
+                        USimpleNameReferenceExpression (identifier = o) [o] : PsiType:A
+                        UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [foo()] : PsiType:int
+                            UIdentifier (Identifier (foo)) [UIdentifier (Identifier (foo))]
+                            USimpleNameReferenceExpression (identifier = foo, resolvesTo = null) [foo] : PsiType:int
+    UClass (name = I) [public abstract interface I {...}]
+        UMethod (name = foo) [public abstract fun foo() : int = UastEmptyExpression]
+    UClass (name = A) [public final class A {...}]
+        UMethod (name = A) [public fun A() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.kt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.kt
new file mode 100644
index 000000000000..07fc7ee6b4e4
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.kt
@@ -0,0 +1,35 @@
+import kotlin.reflect.KProperty
+
+annotation class ThreadSafe
+
+class UnsafeClass
+
+@ThreadSafe
+class NotThreadSafeDelegate {
+    operator fun getValue(thisRef: Any, property: KProperty<*>): UnsafeClass {
+        return UnsafeClass()
+    }
+}
+
+@ThreadSafe
+class SimpleSafeClass
+
+@ThreadSafe
+class ThreadSafeDelegate {
+    operator fun getValue(thisRef: Any, property: KProperty<*>): SimpleSafeClass {
+        return SimpleSafeClass()
+    }
+}
+
+@ThreadSafe
+class SafeClass(val message: String) {
+    val k: SimpleSafeClass by lazy {
+        SimpleSafeClass()
+    }
+    val l: SimpleSafeClass by ThreadSafeDelegate()
+
+    companion object {
+        @JvmStatic
+        val s = UnsafeClass()
+    }
+}
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fe10.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fe10.txt
new file mode 100644
index 000000000000..d8a056caa052
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fe10.txt
@@ -0,0 +1,72 @@
+UFile (package = ) [import kotlin.reflect.KProperty...]
+    UImportStatement (isOnDemand = false) [import kotlin.reflect.KProperty]
+    UClass (name = ThreadSafe) [public abstract annotation ThreadSafe {...}]
+    UClass (name = UnsafeClass) [public final class UnsafeClass {...}]
+        UMethod (name = UnsafeClass) [public fun UnsafeClass() = UastEmptyExpression]
+    UClass (name = NotThreadSafeDelegate) [public final class NotThreadSafeDelegate {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = getValue) [public final fun getValue(@org.jetbrains.annotations.NotNull thisRef: java.lang.Object, @org.jetbrains.annotations.NotNull property: kotlin.reflect.KProperty<?>) : UnsafeClass {...}]
+            UParameter (name = thisRef) [@org.jetbrains.annotations.NotNull var thisRef: java.lang.Object]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = property) [@org.jetbrains.annotations.NotNull var property: kotlin.reflect.KProperty<?>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UReturnExpression [return <init>()] : PsiType:Void
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsafeClass
+                        UIdentifier (Identifier (UnsafeClass)) [UIdentifier (Identifier (UnsafeClass))]
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsafeClass) [<init>] : PsiType:UnsafeClass
+        UMethod (name = NotThreadSafeDelegate) [public fun NotThreadSafeDelegate() = UastEmptyExpression]
+    UClass (name = SimpleSafeClass) [public final class SimpleSafeClass {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = SimpleSafeClass) [public fun SimpleSafeClass() = UastEmptyExpression]
+    UClass (name = ThreadSafeDelegate) [public final class ThreadSafeDelegate {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = getValue) [public final fun getValue(@org.jetbrains.annotations.NotNull thisRef: java.lang.Object, @org.jetbrains.annotations.NotNull property: kotlin.reflect.KProperty<?>) : SimpleSafeClass {...}]
+            UParameter (name = thisRef) [@org.jetbrains.annotations.NotNull var thisRef: java.lang.Object]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = property) [@org.jetbrains.annotations.NotNull var property: kotlin.reflect.KProperty<?>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UReturnExpression [return <init>()] : PsiType:Void
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:SimpleSafeClass
+                        UIdentifier (Identifier (SimpleSafeClass)) [UIdentifier (Identifier (SimpleSafeClass))]
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: SimpleSafeClass) [<init>] : PsiType:SimpleSafeClass
+        UMethod (name = ThreadSafeDelegate) [public fun ThreadSafeDelegate() = UastEmptyExpression]
+    UClass (name = SafeClass) [public final class SafeClass {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UField (name = Companion) [@null public static final var Companion: SafeClass.Companion]
+            UAnnotation (fqName = null) [@null]
+        UField (name = s) [@org.jetbrains.annotations.NotNull @kotlin.jvm.JvmStatic private static final var s: UnsafeClass = <init>()]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UAnnotation (fqName = kotlin.jvm.JvmStatic) [@kotlin.jvm.JvmStatic]
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsafeClass
+                UIdentifier (Identifier (UnsafeClass)) [UIdentifier (Identifier (UnsafeClass))]
+                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsafeClass) [<init>] : PsiType:UnsafeClass
+        UField (name = message) [@org.jetbrains.annotations.NotNull private final var message: java.lang.String]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UField (name = k$delegate) [@org.jetbrains.annotations.NotNull private final var k$delegate: kotlin.Lazy<? extends SimpleSafeClass>]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends SimpleSafeClass>
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] : PsiType:Lazy<? extends SimpleSafeClass>
+                ULambdaExpression [{ ...}] : PsiType:Function0<? extends SimpleSafeClass>
+                    UBlockExpression [{...}]
+                        UReturnExpression [return <init>()]
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:SimpleSafeClass
+                                UIdentifier (Identifier (SimpleSafeClass)) [UIdentifier (Identifier (SimpleSafeClass))]
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: SimpleSafeClass) [<init>] : PsiType:SimpleSafeClass
+        UField (name = l$delegate) [@org.jetbrains.annotations.NotNull private final var l$delegate: ThreadSafeDelegate]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:ThreadSafeDelegate
+                UIdentifier (Identifier (ThreadSafeDelegate)) [UIdentifier (Identifier (ThreadSafeDelegate))]
+                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: ThreadSafeDelegate) [<init>] : PsiType:ThreadSafeDelegate
+        UMethod (name = getK) [public final fun getK() : SimpleSafeClass = UastEmptyExpression]
+        UMethod (name = getL) [public final fun getL() : SimpleSafeClass = UastEmptyExpression]
+        UMethod (name = getMessage) [public final fun getMessage() : java.lang.String = UastEmptyExpression]
+        UMethod (name = SafeClass) [public fun SafeClass(@org.jetbrains.annotations.NotNull message: java.lang.String) = UastEmptyExpression]
+            UParameter (name = message) [@org.jetbrains.annotations.NotNull var message: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UMethod (name = getS) [public static final fun getS() : UnsafeClass = UastEmptyExpression]
+        UClass (name = Companion) [public static final class Companion {...}]
+            UMethod (name = getS) [public final fun getS() : UnsafeClass = UastEmptyExpression]
+            UMethod (name = Companion) [private fun Companion() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fir.txt
new file mode 100644
index 000000000000..6086b8e14d48
--- /dev/null
+++ b/plugins/kotlin/uast/uast-kotlin-fir/testData/type/threadSafe.types.fir.txt
@@ -0,0 +1,77 @@
+UFile (package = ) [import kotlin.reflect.KProperty...]
+    UImportStatement (isOnDemand = false) [import kotlin.reflect.KProperty]
+    UClass (name = ThreadSafe) [public abstract annotation ThreadSafe {...}]
+    UClass (name = UnsafeClass) [public final class UnsafeClass {...}]
+        UMethod (name = UnsafeClass) [public fun UnsafeClass() = UastEmptyExpression]
+    UClass (name = NotThreadSafeDelegate) [public final class NotThreadSafeDelegate {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = getValue) [public final fun getValue(@org.jetbrains.annotations.NotNull thisRef: java.lang.Object, @org.jetbrains.annotations.NotNull property: kotlin.reflect.KProperty<?>) : UnsafeClass {...}]
+            UParameter (name = thisRef) [@org.jetbrains.annotations.NotNull var thisRef: java.lang.Object]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = property) [@org.jetbrains.annotations.NotNull var property: kotlin.reflect.KProperty<?>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UReturnExpression [return <init>()] : PsiType:Void
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsafeClass
+                        UIdentifier (Identifier (UnsafeClass)) [UIdentifier (Identifier (UnsafeClass))]
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsafeClass) [<init>] : PsiType:UnsafeClass
+        UMethod (name = NotThreadSafeDelegate) [public fun NotThreadSafeDelegate() = UastEmptyExpression]
+    UClass (name = SimpleSafeClass) [public final class SimpleSafeClass {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = SimpleSafeClass) [public fun SimpleSafeClass() = UastEmptyExpression]
+    UClass (name = ThreadSafeDelegate) [public final class ThreadSafeDelegate {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UMethod (name = getValue) [public final fun getValue(@org.jetbrains.annotations.NotNull thisRef: java.lang.Object, @org.jetbrains.annotations.NotNull property: kotlin.reflect.KProperty<?>) : SimpleSafeClass {...}]
+            UParameter (name = thisRef) [@org.jetbrains.annotations.NotNull var thisRef: java.lang.Object]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UParameter (name = property) [@org.jetbrains.annotations.NotNull var property: kotlin.reflect.KProperty<?>]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UBlockExpression [{...}] : PsiType:Void
+                UReturnExpression [return <init>()] : PsiType:Void
+                    UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:SimpleSafeClass
+                        UIdentifier (Identifier (SimpleSafeClass)) [UIdentifier (Identifier (SimpleSafeClass))]
+                        USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: SimpleSafeClass) [<init>] : PsiType:SimpleSafeClass
+        UMethod (name = ThreadSafeDelegate) [public fun ThreadSafeDelegate() = UastEmptyExpression]
+    UClass (name = SafeClass) [public final class SafeClass {...}]
+        UAnnotation (fqName = ThreadSafe) [@ThreadSafe]
+        UField (name = Companion) [@null public static final var Companion: SafeClass.Companion]
+            UAnnotation (fqName = null) [@null]
+        UField (name = s) [@org.jetbrains.annotations.NotNull @kotlin.jvm.JvmStatic public final var s: UnsafeClass = <init>()]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UAnnotation (fqName = kotlin.jvm.JvmStatic) [@kotlin.jvm.JvmStatic]
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsafeClass
+                UIdentifier (Identifier (UnsafeClass)) [UIdentifier (Identifier (UnsafeClass))]
+                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsafeClass) [<init>] : PsiType:UnsafeClass
+        UField (name = message) [@org.jetbrains.annotations.NotNull private final var message: java.lang.String]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UField (name = k$delegate) [@org.jetbrains.annotations.NotNull private final var k$delegate: kotlin.Lazy<? extends SimpleSafeClass>]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] : PsiType:Lazy<? extends SimpleSafeClass>
+                UIdentifier (Identifier (lazy)) [UIdentifier (Identifier (lazy))]
+                USimpleNameReferenceExpression (identifier = lazy, resolvesTo = null) [lazy] : PsiType:Lazy<? extends SimpleSafeClass>
+                ULambdaExpression [{ ...}] : PsiType:Function0<? extends SimpleSafeClass>
+                    UBlockExpression [{...}] : PsiType:SimpleSafeClass
+                        UReturnExpression [return <init>()]
+                            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:SimpleSafeClass
+                                UIdentifier (Identifier (SimpleSafeClass)) [UIdentifier (Identifier (SimpleSafeClass))]
+                                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: SimpleSafeClass) [<init>] : PsiType:SimpleSafeClass
+        UField (name = l$delegate) [@org.jetbrains.annotations.NotNull private final var l$delegate: ThreadSafeDelegate]
+            UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+            UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:ThreadSafeDelegate
+                UIdentifier (Identifier (ThreadSafeDelegate)) [UIdentifier (Identifier (ThreadSafeDelegate))]
+                USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: ThreadSafeDelegate) [<init>] : PsiType:ThreadSafeDelegate
+        UMethod (name = getK) [public final fun getK() : SimpleSafeClass = UastEmptyExpression]
+        UMethod (name = getL) [public final fun getL() : SimpleSafeClass = UastEmptyExpression]
+        UMethod (name = getMessage) [public final fun getMessage() : java.lang.String = UastEmptyExpression]
+        UMethod (name = SafeClass) [public fun SafeClass(@org.jetbrains.annotations.NotNull message: java.lang.String) = UastEmptyExpression]
+            UParameter (name = message) [@org.jetbrains.annotations.NotNull var message: java.lang.String]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+        UClass (name = Companion) [public static final class Companion {...}]
+            UField (name = s) [@org.jetbrains.annotations.NotNull @kotlin.jvm.JvmStatic private final var s: UnsafeClass = <init>()]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
+                UAnnotation (fqName = kotlin.jvm.JvmStatic) [@kotlin.jvm.JvmStatic]
+                UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [<init>()] : PsiType:UnsafeClass
+                    UIdentifier (Identifier (UnsafeClass)) [UIdentifier (Identifier (UnsafeClass))]
+                    USimpleNameReferenceExpression (identifier = <init>, resolvesTo = PsiClass: UnsafeClass) [<init>] : PsiType:UnsafeClass
+            UMethod (name = getS) [public final fun getS() : UnsafeClass = UastEmptyExpression]
+            UMethod (name = Companion) [private fun Companion() = UastEmptyExpression]
diff --git a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
index 9606c34237a3..0d2c8767d668 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea/kotlin.uast.uast-kotlin-idea.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="kotlin.common" />
     <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-base" />
     <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea-base" />
diff --git a/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt b/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt
index c6bfc4cf006d..3daeaf09081f 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt
+++ b/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/generate/KotlinUastCodeGenerationPlugin.kt
@@ -218,7 +218,10 @@ class KotlinUastElementFactory(project: Project) : UastElementFactory {
         val thenBranchPsi = thenBranch.sourcePsi as? KtExpression ?: return null
         val elseBranchPsi = elseBranch?.sourcePsi as? KtExpression
 
-        return KotlinUIfExpression(psiFactory.createIf(conditionPsi, thenBranchPsi.ensureBlockExpressionBraces(), elseBranchPsi?.ensureBlockExpressionBraces()), null)
+        return KotlinUIfExpression(
+            psiFactory.createIf(conditionPsi, thenBranchPsi.ensureBlockExpressionBraces(), elseBranchPsi?.ensureBlockExpressionBraces()),
+            givenParent = null
+        )
     }
 
     @Deprecated("use version with context parameter")
diff --git a/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt b/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
index 3307fbd16b7e..355714103b7d 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
+++ b/plugins/kotlin/uast/uast-kotlin-idea/src/org/jetbrains/uast/kotlin/internal/IdeaKotlinUastResolveProviderService.kt
@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
+import org.jetbrains.kotlin.idea.caches.resolve.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.idea.core.resolveCandidates
 import org.jetbrains.kotlin.idea.project.languageVersionSettings
 import org.jetbrains.kotlin.idea.util.actionUnderSafeAnalyzeBlock
-import org.jetbrains.kotlin.idea.util.safeAnalyzeNonSourceRootCode
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtExpression
diff --git a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
index 456fba191ebe..e4290cc52281 100644
--- a/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
+++ b/plugins/kotlin/uast/uast-kotlin/kotlin.uast.uast-kotlin.iml
@@ -13,16 +13,17 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-ir" level="project" />
-    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" />
+    <orderEntry type="module" module-name="kotlin.fir.frontend-independent" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.uast" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
     <orderEntry type="module" module-name="intellij.java.uast" />
     <orderEntry type="library" name="javaslang" level="project" />
-    <orderEntry type="module" module-name="kotlin.common" />
-    <orderEntry type="module" module-name="kotlin.core" />
+    <orderEntry type="module" module-name="kotlin.common" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.core" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.native" scope="RUNTIME" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-idea" scope="RUNTIME" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-base" />
     <orderEntry type="module" module-name="kotlin.uast.uast-kotlin-idea" scope="RUNTIME" />
+    <orderEntry type="module" module-name="kotlin.fe10-analyze.safe-analyze-utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastResolveProviderService.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastResolveProviderService.kt
index 4b32cb0d0150..172f1bdd5895 100644
--- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastResolveProviderService.kt
+++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastResolveProviderService.kt
@@ -3,12 +3,13 @@
 package org.jetbrains.uast.kotlin
 
 import com.intellij.psi.*
+import org.jetbrains.kotlin.asJava.toLightAnnotation
 import org.jetbrains.kotlin.backend.common.descriptors.explicitParameters
 import org.jetbrains.kotlin.builtins.createFunctionType
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.references.readWriteAccess
+import org.jetbrains.kotlin.idea.util.actionUnderSafeAnalyzeBlock
 import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil
 import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor
 import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.error.ErrorUtils
 import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.kotlin.types.typeUtil.nullability
 import org.jetbrains.uast.*
@@ -49,6 +51,10 @@ interface KotlinUastResolveProviderService : BaseKotlinUastResolveProviderServic
     override val baseKotlinConverter: BaseKotlinConverter
         get() = KotlinConverter
 
+    override fun convertToPsiAnnotation(ktElement: KtElement): PsiAnnotation? {
+        return ktElement.actionUnderSafeAnalyzeBlock({ ktElement.toLightAnnotation() }, { null })
+    }
+
     private fun getResolvedCall(sourcePsi: KtCallElement): ResolvedCall<*>? {
         val annotationEntry = sourcePsi.getParentOfType<KtAnnotationEntry>(false) ?: return null
         val bindingContext = sourcePsi.analyze()
@@ -151,6 +157,10 @@ interface KotlinUastResolveProviderService : BaseKotlinUastResolveProviderServic
         }
     }
 
+    override fun getPsiAnnotations(psiElement: PsiModifierListOwner): Array<PsiAnnotation> {
+        return psiElement.actionUnderSafeAnalyzeBlock({ psiElement.annotations }, { emptyArray() })
+    }
+
     override fun resolveBitwiseOperators(ktBinaryExpression: KtBinaryExpression): UastBinaryOperator {
         val other = UastBinaryOperator.OTHER
         val ref = ktBinaryExpression.operationReference
@@ -171,7 +181,7 @@ interface KotlinUastResolveProviderService : BaseKotlinUastResolveProviderServic
     override fun resolveAccessorCall(ktSimpleNameExpression: KtSimpleNameExpression): PsiMethod? {
         val resolvedCall = ktSimpleNameExpression.getResolvedCall(ktSimpleNameExpression.analyze()) ?: return null
         val resultingDescriptor = resolvedCall.resultingDescriptor as? SyntheticJavaPropertyDescriptor ?: return null
-        val access = ktSimpleNameExpression.readWriteAccess(useResolveForReadWrite = false)
+        val access = ktSimpleNameExpression.readWriteAccess()
         val descriptor = (if (access.isWrite) resultingDescriptor.setMethod else resultingDescriptor.getMethod) ?: return null
         return resolveToPsiMethod(ktSimpleNameExpression, descriptor)
     }
diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
index d12da09b1684..99bb92497eef 100644
--- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
@@ -14,7 +14,7 @@ import com.intellij.psi.impl.compiled.StubBuildingVisitor
 import com.intellij.psi.util.PsiTypesUtil
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.asJava.*
-import org.jetbrains.kotlin.asJava.classes.KtLightClass
+import org.jetbrains.kotlin.backend.jvm.serialization.DisabledDescriptorMangler.signatureString
 import org.jetbrains.kotlin.builtins.isBuiltinFunctionalTypeOrSubtype
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter
 import org.jetbrains.kotlin.descriptors.*
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.synthetic.SyntheticMemberDescriptor
 import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.idea.references.readWriteAccess
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment
 import org.jetbrains.kotlin.load.java.sam.SamAdapterDescriptor
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryPackageSourceElement
@@ -36,7 +35,6 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMemberSignature
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.name.StandardClassIds
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
@@ -47,6 +45,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.TypeVariableTypeConstr
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.tower.NewResolvedCallImpl
+import org.jetbrains.kotlin.resolve.calls.util.isFakePsiElement
 import org.jetbrains.kotlin.resolve.constants.*
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
 import org.jetbrains.kotlin.resolve.references.ReferenceAccess
@@ -75,9 +74,6 @@ val kotlinUastPlugin: UastLanguagePlugin by lz {
         ?: KotlinUastLanguagePlugin()
 }
 
-internal fun getContainingLightClass(original: KtDeclaration): KtLightClass? =
-    (original.containingClassOrObject?.toLightClass() ?: original.containingKtFile.findFacadeClass())
-
 internal fun KotlinType.toPsiType(
     source: UElement?,
     element: KtElement,
@@ -296,6 +292,13 @@ internal fun resolveToPsiMethod(
         return resolveToPsiMethod(context, descriptor.underlyingConstructorDescriptor)
     }
 
+    // For synthetic members in enum classes, `source` points to their containing enum class.
+    if (source is KtClass && source.isEnum() && descriptor is SimpleFunctionDescriptor) {
+        val lightClass = source.toLightClass() ?: return null
+        lightClass.methods.find { it.name == descriptor.name.identifier }?.let { return it }
+    }
+
+    // Default primary constructor
     if (descriptor is ConstructorDescriptor && descriptor.isPrimary
         && source is KtClassOrObject && source.primaryConstructor == null
         && source.secondaryConstructors.isEmpty()
@@ -356,7 +359,7 @@ fun resolveToDeclarationImpl(sourcePsi: KtExpression, declarationDescriptor: Dec
         declarationDescriptor = declarationDescriptor.callableFromObject
     }
     if (declarationDescriptor is SyntheticJavaPropertyDescriptor) {
-        declarationDescriptor = when (sourcePsi.readWriteAccess(useResolveForReadWrite = false)) {
+        declarationDescriptor = when (sourcePsi.readWriteAccess()) {
             ReferenceAccess.WRITE, ReferenceAccess.READ_WRITE ->
                 declarationDescriptor.setMethod ?: declarationDescriptor.getMethod
             ReferenceAccess.READ -> declarationDescriptor.getMethod
@@ -394,7 +397,7 @@ fun resolveToDeclarationImpl(sourcePsi: KtExpression, declarationDescriptor: Dec
             ?.let { return it }
     }
 
-    resolveDeserialized(sourcePsi, declarationDescriptor, sourcePsi.readWriteAccess(useResolveForReadWrite = false))?.let { return it }
+    resolveDeserialized(sourcePsi, declarationDescriptor, sourcePsi.readWriteAccess())?.let { return it }
 
     return null
 }
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/AbstractKotlinUastTest.kt b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/AbstractKotlinUastTest.kt
index 56cb8b103f81..2d168759d9af 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/AbstractKotlinUastTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/AbstractKotlinUastTest.kt
@@ -22,8 +22,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
-import org.jetbrains.kotlin.idea.references.ReadWriteAccessChecker
-import org.jetbrains.kotlin.idea.references.ReadWriteAccessCheckerDescriptorsImpl
 import org.jetbrains.kotlin.parsing.KotlinParserDefinition
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.idea.test.ConfigurationKind
@@ -104,10 +102,6 @@ abstract class AbstractKotlinUastTest : AbstractUastTest() {
             BaseKotlinUastResolveProviderService::class.java,
             CliKotlinUastResolveProviderService::class.java
         )
-        application.registerService(
-            ReadWriteAccessChecker::class.java,
-            ReadWriteAccessCheckerDescriptorsImpl::class.java
-        )
         project.registerService(
             KotlinUastResolveProviderService::class.java,
             CliKotlinUastResolveProviderService::class.java
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/KotlinDetachedUastTest.kt b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/KotlinDetachedUastTest.kt
index 8f4e688e4cad..91192ead3215 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/KotlinDetachedUastTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/KotlinDetachedUastTest.kt
@@ -12,8 +12,8 @@ import com.intellij.refactoring.rename.RenamePsiElementProcessor
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.UsefulTestCase
 import junit.framework.TestCase
+import org.jetbrains.kotlin.analysis.decompiled.light.classes.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.asJava.elements.KtLightElement
-import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.core.copied
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastCommentsTest.java b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastCommentsTest.java
index d90a7160cc54..82414c10971d 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastCommentsTest.java
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastCommentsTest.java
@@ -18,6 +18,11 @@ public class FE1UastCommentsTest extends AbstractFE1UastCommentsTest {
         KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("facade.kt")
     public void testFacade() throws Exception {
         runTest("testData/declaration/facade.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastDeclarationTestGenerated.java b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastDeclarationTestGenerated.java
index 23f15546e638..357a5890b40b 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastDeclarationTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastDeclarationTestGenerated.java
@@ -28,6 +28,11 @@ public class FE1UastDeclarationTestGenerated extends AbstractFE1UastDeclarationT
         runTest("../../uast-kotlin-fir/testData/declaration/annotationOnElvis.kt");
     }
 
+    @TestMetadata("commentsOnProperties.kt")
+    public void testCommentsOnProperties() throws Exception {
+        runTest("../../uast-kotlin-fir/testData/declaration/commentsOnProperties.kt");
+    }
+
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
         runTest("../../uast-kotlin-fir/testData/declaration/doWhile.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
index 02f690d5bf75..b277cb5b6756 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
@@ -55,10 +55,18 @@ class FE1UastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
         checkLocalResolve(myFixture)
     }
 
+    fun testResolveLocalDefaultConstructor() {
+        checkResolveLocalDefaultConstructor(myFixture)
+    }
+
     fun testResolveCompiledAnnotation() {
         checkResolveCompiledAnnotation(myFixture)
     }
 
+    fun testResolveSyntheticMethod() {
+        checkResolveSyntheticMethod(myFixture)
+    }
+
     fun testAssigningArrayElementType() {
         checkAssigningArrayElementType(myFixture)
     }
@@ -70,4 +78,8 @@ class FE1UastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
     fun testDetailsOfDeprecatedHidden() {
         checkDetailsOfDeprecatedHidden(myFixture)
     }
+
+    fun testSyntheticEnumMethods() {
+        checkSyntheticEnumMethods(myFixture)
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiTest.kt b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiTest.kt
index ee85f2809cb0..d77c35ed4aad 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiTest.kt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiTest.kt
@@ -10,7 +10,6 @@ import org.jetbrains.uast.UFile
 import org.jetbrains.uast.test.common.kotlin.UastResolveApiTestBase
 import org.jetbrains.uast.test.kotlin.env.AbstractFE1UastTest
 import org.junit.runner.RunWith
-import java.io.File
 
 @RunWith(JUnit3RunnerWithInners::class)
 class FE1UastResolveApiTest : AbstractFE1UastTest() {
@@ -20,7 +19,6 @@ class FE1UastResolveApiTest : AbstractFE1UastTest() {
 
     @TestMetadata("uast-kotlin-fir/testData/declaration")
     @TestDataPath("/")
-    @RunWith(JUnit3RunnerWithInners::class)
     class Declaration : AbstractFE1UastTest(), UastResolveApiTestBase {
         override var testDataDir = KotlinRoot.DIR.resolve("uast/uast-kotlin-fir/testData/declaration")
 
@@ -46,6 +44,24 @@ class FE1UastResolveApiTest : AbstractFE1UastTest() {
         }
     }
 
+    @TestMetadata("uast-kotlin-fir/testData/type")
+    @TestDataPath("/")
+    @RunWith(JUnit3RunnerWithInners::class)
+    class Type : AbstractFE1UastTest(), UastResolveApiTestBase {
+        override var testDataDir = KotlinRoot.DIR_PATH.resolve("uast/uast-kotlin-fir/testData/type").toFile()
+
+        override val isFirUastPlugin: Boolean = false
+
+        override fun check(testName: String, file: UFile) {
+            // Bogus
+        }
+
+        @TestMetadata("threadSafe.kt")
+        fun testThreadSafe() {
+            doTest("threadSafe", ::checkThreadSafe)
+        }
+    }
+
     @TestMetadata("uast-kotlin/tests/testData")
     @TestDataPath("/")
     class Legacy : AbstractFE1UastTest(), UastResolveApiTestBase {
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastTypesTestGenerated.java b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastTypesTestGenerated.java
index 7c4b9d819f14..77e27af3df6c 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastTypesTestGenerated.java
+++ b/plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastTypesTestGenerated.java
@@ -43,6 +43,16 @@ public class FE1UastTypesTestGenerated extends AbstractFE1UastTypesTest {
         runTest("../../uast-kotlin-fir/testData/type/classLiteral.kt");
     }
 
+    @TestMetadata("objectLiteral.kt")
+    public void testObjectLiteral() throws Exception {
+        runTest("../../uast-kotlin-fir/testData/type/objectLiteral.kt");
+    }
+
+    @TestMetadata("threadSafe.kt")
+    public void testThreadSafe() throws Exception {
+        runTest("../../uast-kotlin-fir/testData/type/threadSafe.kt");
+    }
+
     @TestMetadata("typeCast.kt")
     public void testTypeCast() throws Exception {
         runTest("../../uast-kotlin-fir/testData/type/typeCast.kt");
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/CommentOwners.comments.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/CommentOwners.comments.txt
index 2c2ce1c751e4..8f6c51e98a6d 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/CommentOwners.comments.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/CommentOwners.comments.txt
@@ -3,7 +3,7 @@ UFile (package = ) [ /** file */, // file, /* file */ ]
         UField (name = topLevelProperty) [ /** topLevelProperty */ ]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [  ]
             ULiteralExpression (value = 42) [  ]
-        UMethod (name = getTopLevelProperty) [ /** topLevelProperty */ ]
+        UMethod (name = getTopLevelProperty) [  ]
         UMethod (name = topLevelFun) [ /** topLevelFun */ ]
             UBlockExpression [  ]
                 UReturnExpression [  ]
@@ -53,7 +53,7 @@ UFile (package = ) [ /** file */, // file, /* file */ ]
         UField (name = classLevelProperty) [ /** classLevelProperty */ ]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [  ]
             ULiteralExpression (value = 42) [  ]
-        UMethod (name = getClassLevelProperty) [ /** classLevelProperty */ ]
+        UMethod (name = getClassLevelProperty) [  ]
         UMethod (name = classLevelMethod) [ /** classLevelMethod */ ]
             UBlockExpression [  ]
                 UReturnExpression [  ]
@@ -77,3 +77,7 @@ UFile (package = ) [ /** file */, // file, /* file */ ]
             UAnnotation (fqName = null) [  ]
             USimpleNameReferenceExpression (identifier = MyBooleanEnum) [ /** enum false value */ ]
         UMethod (name = MyBooleanEnum) [ /** enum */ ]
+        UMethod (name = values) [  ]
+        UMethod (name = valueOf) [  ]
+            UParameter (name = name) [  ]
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull) [  ]
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.render.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.render.txt
index 0b50ead54f03..72324302eb1b 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.render.txt
@@ -9,7 +9,7 @@ public final class MyColor {
 }
 
 public final class Some {
-    @org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy
+    @org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>
     @org.jetbrains.annotations.NotNull private final var lambda: kotlin.Lazy<MyColor> = lazy({
         return <init>(1, 2, 3)
     })
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.values.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.values.txt
index 1e2d5bdd8445..67e2db6f3b2c 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.values.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/Delegate.values.txt
@@ -17,7 +17,7 @@ UFile (package = ) [public final class MyColor {...]
             UParameter (name = z) [@org.jetbrains.annotations.NotNull var z: int]
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
     UClass (name = Some) [public final class Some {...}]
-        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy]
+        UField (name = delegate$delegate) [@org.jetbrains.annotations.NotNull private final var delegate$delegate: kotlin.Lazy<? extends MyColor>]
             UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [lazy({ ...})] = external lazy({
     return <init>(18, 2, 3)
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log-ide.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log-ide.txt
index bd07a46ab5d1..06fe82ce71ab 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log-ide.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log-ide.txt
@@ -17,3 +17,7 @@ UFile (package = )
         UMethod (name = Style)
             UParameter (name = value)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log.txt
index bd07a46ab5d1..06fe82ce71ab 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.log.txt
@@ -17,3 +17,7 @@ UFile (package = )
         UMethod (name = Style)
             UParameter (name = value)
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render-ide.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render-ide.txt
index 0b9be77a0f32..1863fddafe55 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render-ide.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render-ide.txt
@@ -9,4 +9,6 @@ public enum Style {
     public abstract fun getExitAnimation() : java.lang.String = UastEmptyExpression
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
 }
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render.txt
index 0b9be77a0f32..1863fddafe55 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValueMembers.render.txt
@@ -9,4 +9,6 @@ public enum Style {
     public abstract fun getExitAnimation() : java.lang.String = UastEmptyExpression
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.NotNull value: java.lang.String) = UastEmptyExpression
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
 }
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log-ide.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log-ide.txt
index 130f197f532e..02db2382f3dc 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log-ide.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log-ide.txt
@@ -22,3 +22,7 @@ UFile (package = )
         UMethod (name = Style)
             UParameter (name = value)
                 UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log.txt
index 130f197f532e..02db2382f3dc 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.log.txt
@@ -22,3 +22,7 @@ UFile (package = )
         UMethod (name = Style)
             UParameter (name = value)
                 UAnnotation (fqName = org.jetbrains.annotations.Nullable)
+        UMethod (name = values)
+        UMethod (name = valueOf)
+            UParameter (name = name)
+                UAnnotation (fqName = org.jetbrains.annotations.NotNull)
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render-ide.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render-ide.txt
index 04517caf5b1a..82d442773aa8 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render-ide.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render-ide.txt
@@ -6,4 +6,6 @@ public enum Style {
     @null UNKNOWN(null)
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
 }
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render.txt
index 04517caf5b1a..82d442773aa8 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/EnumValuesConstructors.render.txt
@@ -6,4 +6,6 @@ public enum Style {
     @null UNKNOWN(null)
     public final fun getValue() : java.lang.String = UastEmptyExpression
     private fun Style(@org.jetbrains.annotations.Nullable value: java.lang.String) = UastEmptyExpression
+    public static fun values() : Style[] = UastEmptyExpression
+    public static fun valueOf(@org.jetbrains.annotations.NotNull name: java.lang.String) : Style = UastEmptyExpression
 }
diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/PropertyDelegate.render.txt b/plugins/kotlin/uast/uast-kotlin/tests/testData/PropertyDelegate.render.txt
index 0f4ec9edd55a..7cc7e47d8f63 100644
--- a/plugins/kotlin/uast/uast-kotlin/tests/testData/PropertyDelegate.render.txt
+++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/PropertyDelegate.render.txt
@@ -1,6 +1,6 @@
 public final class PropertyDelegateKt {
-    @org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy
-    @org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy
+    @org.jetbrains.annotations.NotNull private static final var sdCardPath$delegate: kotlin.Lazy<? extends java.lang.String>
+    @org.jetbrains.annotations.NotNull @kotlin.Suppress private static final var annotatedDelegate$delegate: kotlin.Lazy<? extends java.lang.Integer>
     public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression
     public static final fun localPropertyTest() : void {
         var sdCardPathLocal: java.lang.String
diff --git a/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml b/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
index 03a9bdb26888..15d05aaa2e21 100644
--- a/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
+++ b/plugins/kotlin/util/compiler-dependencies/kotlin.util.compiler-dependencies.iml
@@ -15,7 +15,8 @@
     <orderEntry type="library" name="kotlinc.kotlin-stdlib-minimal-for-test" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-gradle-statistics" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-reflect" level="project" />
-    <orderEntry type="library" name="kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
+    <orderEntry type="library" name="kotlinc.kotlin-jps-plugin-classpath" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlinx-serialization-compiler-plugin" level="project" />
diff --git a/plugins/kotlin/util/project-model-updater/resources/model.properties b/plugins/kotlin/util/project-model-updater/resources/model.properties
index f0f52caf673b..48e2d1991646 100644
--- a/plugins/kotlin/util/project-model-updater/resources/model.properties
+++ b/plugins/kotlin/util/project-model-updater/resources/model.properties
@@ -1,2 +1,2 @@
-kotlincVersion=1.6.21-release-for-android-studio
+kotlincVersion=1.7.0-release-for-android-studio
 kotlincArtifactsMode=MAVEN
diff --git a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt
index 29ad794ead4b..d705eddb728a 100644
--- a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt
+++ b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/Main.kt
@@ -67,7 +67,7 @@ private fun patchKotlincLibs(args: Args, isCommunity: Boolean, dotIdea: File) {
     val regexes = KotlincArtifactsMode.values().flatMap { generateKotlincLibraries(it, stubVersion, isCommunity) }
         .flatMap { it.classes }
         .map {
-            it.jpsPath.generateXml().escapeForRegex().replace(stubVersion, """\d+.\d+.\d+(-SNAPSHOT|-M1|-M2|-RC|-release)?(-\d+)?""")
+            it.jpsPath.generateXml().escapeForRegex().replace(stubVersion, """\d+.\d+.\d+(-SNAPSHOT|-M1|-M2|-RC|-release|-dev|-Beta)?(-\d+)?""")
         }
         .distinct()
         .map { Regex(it) }
diff --git a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/kotlincLibraries.kt b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/kotlincLibraries.kt
index eeee357cd26e..aecc0496d83b 100644
--- a/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/kotlincLibraries.kt
+++ b/plugins/kotlin/util/project-model-updater/src/org/jetbrains/tools/model/updater/kotlincLibraries.kt
@@ -35,13 +35,15 @@ fun generateKotlincLibraries(kotlincArtifactsMode: KotlincArtifactsMode, version
         kotlincForIdeWithStandardNaming("kotlinc.noarg-compiler-plugin", version),
         kotlincForIdeWithStandardNaming("kotlinc.parcelize-compiler-plugin", version),
         kotlincForIdeWithStandardNaming("kotlinc.sam-with-receiver-compiler-plugin", version),
+        kotlincForIdeWithStandardNaming("kotlinc.kotlin-jps-common", version),
+        singleJarMvnLib("kotlinc.kotlin-jps-plugin-classpath", "$ktGroup:kotlin-jps-plugin-classpath:$version", transitive = false),
         singleJarMvnLib("kotlinc.compiler-components-for-jps", "$ktGroup:compiler-components-for-jps:$version", transitive = false),
         singleJarMvnLib("kotlinc.kotlin-scripting-common", "$ktGroup:kotlin-scripting-common:$version", transitive = false),
         singleJarMvnLib("kotlinc.kotlin-scripting-compiler-impl", "$ktGroup:kotlin-scripting-compiler-impl:$version", transitive = false),
         singleJarMvnLib("kotlinc.kotlin-scripting-compiler", "$ktGroup:kotlin-scripting-compiler:$version", transitive = false),
         singleJarMvnLib("kotlinc.kotlin-scripting-jvm", "$ktGroup:kotlin-scripting-jvm:$version", transitive = false),
         singleJarMvnLib("kotlinc.kotlin-reflect", "$ktGroup:kotlin-reflect:$version", excludes = listOf(MavenId(ktGroup, "kotlin-stdlib"))),
-        singleJarMvnLib("kotlin-script-runtime", "$ktGroup:kotlin-script-runtime:$version"),
+        singleJarMvnLib("kotlinc.kotlin-script-runtime", "$ktGroup:kotlin-script-runtime:$version"),
         run {
             val mavenIds = listOf(
                 MavenId.fromCoordinates("$ktGroup:kotlin-stdlib-jdk8:$version"),