Fixed IDEA plugin test on Java 8.

If you want to run such test locally, you should set up environment variable JDK8_PATH to /usr/lib/jvm/java-8-oracle/jre or something like that. Build server also should have such environment variable.
Restrict unit with 145.256
2026-04-11 15:52:06 +00:00 · 2016-06-30 18:29:28 +03:00 · 2016-06-30 18:29:28 +03:00 · 2016-06-30 18:29:27 +03:00 · 2016-06-30 18:29:27 +03:00 · 2016-06-30 18:29:26 +03:00
341 changed files with 1117 additions and 1104 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -23,19 +23,5 @@
        <processorPath useClasspath="true" />
      </profile>
    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="android-studio" target="1.8" />
-      <module name="bare-plugin" target="1.8" />
-      <module name="idea" target="1.8" />
-      <module name="idea-analysis" target="1.8" />
-      <module name="idea-completion" target="1.8" />
-      <module name="idea-core" target="1.8" />
-      <module name="idea-live-templates" target="1.8" />
-      <module name="idea-repl" target="1.8" />
-      <module name="idea-runner" target="1.8" />
-      <module name="idea-test-framework" target="1.8" />
-      <module name="j2k" target="1.8" />
-      <module name="kannotator-jps-plugin-test" target="1.8" />
-    </bytecodeTargetLevel>
  </component>
 </project>
--- a/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml
+++ b/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml
@@ -13,7 +13,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=64m -Dswing.noxp=true" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/All_Non_Compiler_Tests.xml
+++ b/.idea/runConfigurations/All_Non_Compiler_Tests.xml
@@ -13,7 +13,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1300m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=400m -XX:+UseCodeCacheFlushing -XX:ReservedCodeCacheSize=128m -Dswing.noxp=true" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/All_in_jps_tests.xml
+++ b/.idea/runConfigurations/All_in_jps_tests.xml
@@ -8,7 +8,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/Android_Studio.xml
+++ b/.idea/runConfigurations/Android_Studio.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="Android Studio" type="Application" factoryName="Application">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
+    <option name="VM_PARAMETERS" value="-Didea.paths.selector=AndroidStudioPreview -Didea.platform.prefix=AndroidStudio -Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin,$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/android-studio/sdk/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
--- a/.idea/runConfigurations/Codegen_Tests_on_Android.xml
+++ b/.idea/runConfigurations/Codegen_Tests_on_Android.xml
@@ -8,7 +8,7 @@
    <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx850m -XX:+UseCodeCacheFlushing" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx512m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="IDEA" type="Application" factoryName="Application" singleton="true">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
--- a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
+++ b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="Application" factoryName="Application" singleton="true">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=400m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Didea.ProcessCanceledException=disabled -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
--- a/.idea/runConfigurations/J2K_Tests.xml
+++ b/.idea/runConfigurations/J2K_Tests.xml
@@ -13,7 +13,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="pattern" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx700m" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx350m -XX:MaxPermSize=320m" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/Js_backend_tests.xml
+++ b/.idea/runConfigurations/Js_backend_tests.xml
@@ -8,7 +8,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx1250m -XX:+UseCodeCacheFlushing" />
+    <option name="VM_PARAMETERS" value="-ea -XX:+HeapDumpOnOutOfMemoryError -Xmx900m -XX:MaxPermSize=320m -XX:+UseCodeCacheFlushing" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/Smart_Completion_Tests.xml
+++ b/.idea/runConfigurations/Smart_Completion_Tests.xml
@@ -13,7 +13,7 @@
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="pattern" />
-    <option name="VM_PARAMETERS" value="-ea -Xmx850m" />
+    <option name="VM_PARAMETERS" value="-ea -Xmx512m -XX:MaxPermSize=320m" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
    <option name="ENV_VARIABLES" />
--- a/.idea/runConfigurations/Update_Dist_Run.xml
+++ b/.idea/runConfigurations/Update_Dist_Run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="Update-Dist-Run" type="Application" factoryName="Application" singleton="true">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="MAIN_CLASS_NAME" value="com.intellij.idea.Main" />
-    <option name="VM_PARAMETERS" value="-Xmx1250m -XX:ReservedCodeCacheSize=64m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
+    <option name="VM_PARAMETERS" value="-Xmx800m -XX:ReservedCodeCacheSize=64m -XX:MaxPermSize=450m -XX:+HeapDumpOnOutOfMemoryError -ea -Didea.is.internal=true -Didea.debug.mode=true -Didea.system.path=../system-idea -Didea.config.path=../config-idea -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=true -Dsun.io.useCanonCaches=false -Dplugin.path=$PROJECT_DIR$/out/artifacts/Kotlin -Dkotlin.internal.mode.enabled=true -Didea.additional.classpath=../idea-kotlin-runtime/kotlin-runtime.jar,../idea-kotlin-runtime/kotlin-reflect.jar" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/ideaSDK/bin" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
--- a/android-studio/android-studio.iml
+++ b/android-studio/android-studio.iml
@@ -3,7 +3,7 @@
  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" scope="RUNTIME" name="android-studio" level="project" />
    <orderEntry type="module" module-name="idea" scope="PROVIDED" />
--- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
@@ -130,7 +130,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest
    }

    private Disposable createDisposable(String debugName) {
-        Disposable disposable = Disposer.newDisposable("CompileDisposable" + debugName);
+        Disposable disposable = Disposer.newDisposable();
        Disposer.register(getTestRootDisposable(), disposable);
        return disposable;
    }
--- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
@@ -91,7 +91,8 @@ public abstract class KtUsefulTestCase extends TestCase {
        boolean isPerformanceTest = isPerformanceTest();
        ApplicationInfoImpl.setInPerformanceTest(isPerformanceTest);
        // turn off Disposer debugging for performance tests
-        oldDisposerDebug = Disposer.setDebugMode(Disposer.isDebugMode() && !isPerformanceTest);
+        oldDisposerDebug = Disposer.isDebugMode() && !isPerformanceTest;
+        Disposer.setDebugMode(oldDisposerDebug);
    }

    @Override
--- a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java
@@ -23,11 +23,11 @@ import org.jetbrains.annotations.Nullable;
 public class MockSchemesManagerFactory extends SchemesManagerFactory {
  private static final SchemesManager EMPTY = new EmptySchemesManager();

+  @NotNull
  @Override
-  protected <T extends Scheme, E extends ExternalizableScheme> SchemesManager<T, E> create(@NotNull String directoryName,
-                                                                                           @NotNull SchemeProcessor<E> processor,
-                                                                                           @NotNull RoamingType roamingType,
-                                                                                           @Nullable String presentableName) {
+  public <T extends Scheme, E extends ExternalizableScheme> SchemesManager<T, E> createSchemesManager(
+          @NotNull String directoryName, @NotNull SchemeProcessor<E> processor, @NotNull RoamingType roamingType
+  ) {
    //noinspection unchecked
    return EMPTY;
  }
--- a/compiler/tests-java8/compiler-tests-java8.iml
+++ b/compiler/tests-java8/compiler-tests-java8.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/../java8-tests/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="backend" />
    <orderEntry type="module" module-name="frontend" />
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -51,7 +51,7 @@
    <orderEntry type="module-library">
      <library>
        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/openapi.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/idea_rt.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
@@ -60,7 +60,7 @@
    <orderEntry type="module-library">
      <library>
        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../ideaSDK/core/asm-all.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/openapi.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
--- a/idea-runner/idea-runner.iml
+++ b/idea-runner/idea-runner.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="idea-full" level="project" />
    <orderEntry type="module" module-name="idea" scope="PROVIDED" />
--- a/idea/formatter/formatter.iml
+++ b/idea/formatter/formatter.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="kotlin-runtime" level="project" />
    <orderEntry type="module" module-name="frontend" />
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="backend" />
    <orderEntry type="module" module-name="frontend" />
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
@@ -49,10 +49,10 @@ public class KotlinHighlightingColors {

    // class kinds
    public static final TextAttributesKey CLASS = createTextAttributesKey("KOTLIN_CLASS", DefaultLanguageHighlighterColors.CLASS_NAME);
-    public static final TextAttributesKey TYPE_PARAMETER = createTextAttributesKey("KOTLIN_TYPE_PARAMETER", JavaHighlightingColors.TYPE_PARAMETER_NAME_ATTRIBUTES);
+    public static final TextAttributesKey TYPE_PARAMETER = createTextAttributesKey("KOTLIN_TYPE_PARAMETER", DefaultLanguageHighlighterColors.PARAMETER);
    public static final TextAttributesKey ABSTRACT_CLASS = createTextAttributesKey("KOTLIN_ABSTRACT_CLASS", DefaultLanguageHighlighterColors.CLASS_NAME);
    public static final TextAttributesKey TRAIT = createTextAttributesKey("KOTLIN_TRAIT", DefaultLanguageHighlighterColors.INTERFACE_NAME);
-    public static final TextAttributesKey ANNOTATION = createTextAttributesKey("KOTLIN_ANNOTATION", JavaHighlightingColors.ANNOTATION_NAME_ATTRIBUTES);
+    public static final TextAttributesKey ANNOTATION = createTextAttributesKey("KOTLIN_ANNOTATION");
    public static final TextAttributesKey OBJECT = createTextAttributesKey("KOTLIN_OBJECT", CLASS);
    public static final TextAttributesKey ENUM_ENTRY = createTextAttributesKey("KOTLIN_ENUM_ENTRY", DefaultLanguageHighlighterColors.INSTANCE_FIELD);

--- a/idea/idea-android/idea-android.iml
+++ b/idea/idea-android/idea-android.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="idea-full" level="project" />
    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
--- a/idea/idea-completion/idea-completion.iml
+++ b/idea/idea-completion/idea-completion.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="descriptors" />
    <orderEntry type="module" module-name="idea-analysis" />
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJava8BasicCompletionTest.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/AbstractJava8BasicCompletionTest.java
@@ -24,6 +24,6 @@ public abstract class AbstractJava8BasicCompletionTest extends AbstractJvmBasicC
    @NotNull
    @Override
    protected LightProjectDescriptor getProjectDescriptor() {
-        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK;
+        return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE_FULL_JDK8;
    }
 }
--- a/idea/idea-core/idea-core.iml
+++ b/idea/idea-core/idea-core.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="descriptors" />
    <orderEntry type="library" name="idea-full" level="project" />
--- a/idea/idea-live-templates/idea-live-templates.iml
+++ b/idea/idea-live-templates/idea-live-templates.iml
@@ -6,7 +6,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="util" />
    <orderEntry type="module" module-name="idea-core" />
--- a/idea/idea-maven/idea-maven.iml
+++ b/idea/idea-maven/idea-maven.iml
@@ -7,7 +7,7 @@
      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="idea-full" level="project" />
    <orderEntry type="module" module-name="idea" />
--- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java
+++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java
@@ -145,7 +145,6 @@ public abstract class MavenTestCase extends UsefulTestCase {
    protected void tearDown() throws Exception {
        try {
            MavenServerManager.getInstance().shutdown(true);
-            MavenArtifactDownloader.awaitQuiescence(100, TimeUnit.SECONDS);
            myProject = null;
            UIUtil.invokeAndWaitIfNeeded(new Runnable() {
                @Override
--- a/idea/idea-repl/idea-repl.iml
+++ b/idea/idea-repl/idea-repl.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="library" name="idea-full" level="project" />
    <orderEntry type="module" module-name="frontend" />
    <orderEntry type="module" module-name="idea-analysis" />
--- a/idea/idea-test-framework/idea-test-framework.iml
+++ b/idea/idea-test-framework/idea-test-framework.iml
@@ -5,7 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="tests-common" />
    <orderEntry type="module" module-name="frontend" />
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinWithJdkAndRuntimeLightProjectDescriptor.java
@@ -25,10 +25,10 @@ public class KotlinWithJdkAndRuntimeLightProjectDescriptor extends KotlinJdkAndL
    }

    public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE = new KotlinWithJdkAndRuntimeLightProjectDescriptor();
-    public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_FULL_JDK = new KotlinWithJdkAndRuntimeLightProjectDescriptor() {
+    public static final KotlinWithJdkAndRuntimeLightProjectDescriptor INSTANCE_FULL_JDK8 = new KotlinWithJdkAndRuntimeLightProjectDescriptor() {
        @Override
        public Sdk getSdk() {
-            return PluginTestCaseBase.fullJdk();
+            return PluginTestCaseBase.fullJdk8();
        }
    };
 }
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.test;
 import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.test.KotlinTestUtils;

@@ -53,6 +54,16 @@ public class PluginTestCaseBase {
        return getSdk(javaHome, "Full");
    }

+    @NotNull
+    public static Sdk fullJdk8() {
+        String javaHome = System.getenv("JDK8_PATH");
+        assert javaHome != null : "You should set up environment variable JDK8_PATH. " +
+                                  "Example: /usr/lib/jvm/java-8-oracle/jre";
+        assert new File(javaHome).isDirectory();
+        VfsRootAccess.allowRootAccess(javaHome);
+        return getSdk(javaHome, "Full");
+    }
+
    public static boolean isAllFilesPresentTest(@NotNull String testName) {
        return StringUtil.startsWithIgnoreCase(testName, "allFilesPresentIn");
    }
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -15,7 +15,7 @@
      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
      <excludeFolder url="file://$MODULE_DIR$/testData/debugger/tinyApp/classes" />
    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module" module-name="backend" />
    <orderEntry type="module" module-name="frontend" />
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
  <version>@snapshot@</version>
  <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>

-  <idea-version since-build="145.257" until-build="163.*"/>
+  <idea-version since-build="143.379.11" until-build="145.256"/>

  <depends>com.intellij.modules.java</depends>

--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
@@ -144,7 +144,7 @@ abstract class KotlinGenerateTestSupportActionBase(
                val fileTemplate = FileTemplateManager.getInstance(project).getCodeTemplate(fileTemplateDescriptor.fileName)
                var templateText = fileTemplate.text.replace(BODY_VAR, "")
                if (templateText.contains(NAME_VAR)) {
-                    var name = if (templateText.contains("test$NAME_VAR")) "Name" else "name"
+                    var name = "Name"
                    if (!ApplicationManager.getApplication().isUnitTestMode) {
                        name = Messages.showInputDialog("Choose test name: ", commandName, null, name, NAME_VALIDATOR)
                                ?: return@executeWriteCommand
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinMoveLeftRightHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinMoveLeftRightHandler.kt
@@ -16,6 +16,8 @@

 package org.jetbrains.kotlin.idea.codeInsight

+/*
+
 import com.intellij.codeInsight.editorActions.moveLeftRight.MoveElementLeftRightHandler
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.psi.*
@@ -35,3 +37,5 @@ class KotlinMoveLeftRightHandler : MoveElementLeftRightHandler() {
        return emptyArray()
    }
 }
+
+*/
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
@@ -69,8 +69,8 @@ class GradleKotlinJavaFrameworkSupportProvider() : GradleFrameworkSupportProvide
                .addBuildscriptRepositoriesDefinition("mavenCentral()")
                .addRepositoriesDefinition("mavenCentral()")

-                .addBuildscriptPropertyDefinition("ext.kotlin_version = '$kotlinVersion'")
-                .addDependencyNotation(KotlinWithGradleConfigurator.LIBRARY)
-                .addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH)
+                // TODO: once IDEA-148110 is fixed, define kotlin_version property in buildscript
+                .addDependencyNotation(KotlinWithGradleConfigurator.LIBRARY.replace("\$kotlin_version", kotlinVersion))
+                .addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH.replace("\$kotlin_version", kotlinVersion))
    }
 }
--- a/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
@@ -70,14 +70,14 @@ class InlineFunctionHyperLinkInfo(
        class InlineFunctionBodyInfo(file: VirtualFile, line: Int): InlineInfo("inline function body", file, line)
    }

-    private class InlineInfoCellRenderer : SimpleColoredComponent(), ListCellRenderer<InlineInfo> {
+    private class InlineInfoCellRenderer : SimpleColoredComponent(), ListCellRenderer {
        init {
            isOpaque = true
        }

        override fun getListCellRendererComponent(
-                list: JList<out InlineInfo>?,
-                value: InlineInfo?,
+                list: JList?,
+                value: Any?,
                index: Int,
                isSelected: Boolean,
                cellHasFocus: Boolean
@@ -86,7 +86,7 @@ class InlineFunctionHyperLinkInfo(
            clear()

            if (value != null) {
-                append(value.prefix)
+                append((value as InlineInfo).prefix)
            }

            if (isSelected) {
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt
@@ -27,6 +27,9 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import org.jdom.Element

+private val AFTER_CLASS_ANNOTATION_NAME = "org.junit.AfterClass"
+private val BEFORE_CLASS_ANNOTATION_NAME = "org.junit.BeforeClass"
+
 class KotlinJUnitStaticEntryPoint(private var wasSelected: Boolean = true) : EntryPoint() {
    override fun getDisplayName() = "JUnit static methods"

@@ -34,7 +37,7 @@ class KotlinJUnitStaticEntryPoint(private var wasSelected: Boolean = true) : Ent

    override fun isEntryPoint(refElement: RefElement, psiElement: PsiElement) = isEntryPoint(psiElement)

-    private val staticJUnitAnnotations = listOf(JUnitUtil.BEFORE_CLASS_ANNOTATION_NAME, JUnitUtil.AFTER_CLASS_ANNOTATION_NAME,
+    private val staticJUnitAnnotations = listOf(BEFORE_CLASS_ANNOTATION_NAME, AFTER_CLASS_ANNOTATION_NAME,
                                                JUnitUtil.PARAMETRIZED_PARAMETERS_ANNOTATION_NAME)

    override fun isEntryPoint(psiElement: PsiElement) = psiElement is PsiMethod &&
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -4,7 +4,7 @@ import org.junit.Test
 // CONFIGURE_LIBRARY: JUnit@lib/junit-4.12.jar
 class A {
    @Test
-    fun name() {
+    fun testName() {
        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
    }
 }
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -4,8 +4,8 @@ import org.testng.annotations.DataProvider
 import org.testng.annotations.Test

@Test class A {
-    @DataProvider(name = "name")
-    fun name(): Array<Array<Any>> {
+    @DataProvider(name = "Name")
+    fun Name(): Array<Array<Any>> {
        throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
    }
 }
--- a/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
@@ -4,23 +4,23 @@ package testing
 import junit.framework.TestCase
 import org.junit.Test

-abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> : TestCase() {
+abstract class <lineMarker></lineMarker>KBase : TestCase() {
    @Test
    fun testFoo() {

    }
 }

-class <lineMarker descr="*">KTest</lineMarker> : KBase() {
+class <lineMarker></lineMarker>KTest : KBase() {
    @Test
-    fun <lineMarker descr="*">testBar</lineMarker>() {
+    fun <lineMarker></lineMarker>testBar() {

    }
 }

-class <lineMarker descr="*">KTest2</lineMarker> : KBase() {
+class <lineMarker></lineMarker>KTest2 : KBase() {
    @Test
-    fun <lineMarker descr="*">testBaz</lineMarker>() {
+    fun <lineMarker></lineMarker>testBaz() {

    }
 }
--- a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
@@ -3,23 +3,23 @@ package testing

 import org.testng.annotations.Test

-abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> {
+abstract class <lineMarker></lineMarker>KBase {
    @Test
-    fun <lineMarker descr="*">testFoo</lineMarker>() {
+    fun <lineMarker></lineMarker>testFoo() {

    }
 }

-class <lineMarker descr="*">KTest</lineMarker> : KBase() {
+class <lineMarker></lineMarker>KTest : KBase() {
    @Test
-    fun <lineMarker descr="*">testBar</lineMarker>() {
+    fun <lineMarker></lineMarker>testBar() {

    }
 }

-class <lineMarker descr="*">KTest2</lineMarker> : KBase() {
+class <lineMarker></lineMarker>KTest2 : KBase() {
    @Test
-    fun <lineMarker descr="*">testBaz</lineMarker>() {
+    fun <lineMarker></lineMarker>testBaz() {

    }
 }
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -31,7 +31,7 @@ class MyDelegateThrowsException {
 // SKIP: stackTrace

 Compile bytecode for args.size
- frame    = main:9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
+ frame    = main():9, DelegatedPropertyInClassKt {delegatedPropertyInClass}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 6)
   local    = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 7)
     field    = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 13)
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -25,7 +25,7 @@ class MyDelegate {
 // PRINT_FRAME

 Compile bytecode for args.size
- frame    = main:9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
+ frame    = main():9, DelegatedPropertyInClassWoRendererKt {delegatedPropertyInClassWoRenderer}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6)
   local    = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 7)
     field    = prop: int = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 13)
--- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 Compile bytecode for a2.prop
- frame    = main:14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
+ frame    = main():14, EvBreakpointOnPropertyDeclarationKt {evBreakpointOnPropertyDeclaration}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 7)
   local    = a1: evBreakpointOnPropertyDeclaration.A = {evBreakpointOnPropertyDeclaration.A@uniqueID} (sp = evBreakpointOnPropertyDeclaration.kt, 8)
     field    = prop: int = 1 (sp = evBreakpointOnPropertyDeclaration.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
- frame    = main:13, EvDelegatedPropertyKt {evDelegatedProperty}
+ frame    = main():13, EvDelegatedPropertyKt {evDelegatedProperty}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDelegatedProperty.kt, 9)
   local    = a: evDelegatedProperty.A = {evDelegatedProperty.A@uniqueID} (sp = evDelegatedProperty.kt, 10)
     field    = prop$delegate: kotlin.properties.ReadWriteProperty = {kotlin.properties.NotNullVar@uniqueID} (sp = evDelegatedProperty.kt, 6)
--- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
+++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
@@ -16,7 +16,7 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 Compile bytecode for a.prop
- frame    = main:10, EvDuplicateItemsKt {evDuplicateItems}
+ frame    = main():10, EvDuplicateItemsKt {evDuplicateItems}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evDuplicateItems.kt, 7)
   local    = a: evDuplicateItems.A = {evDuplicateItems.A@uniqueID} (sp = evDuplicateItems.kt, 8)
     field    = prop: int = 1 (sp = evDuplicateItems.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
- frame    = main:10, EvFinalPropertyKt {evFinalProperty}
+ frame    = main():10, EvFinalPropertyKt {evFinalProperty}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evFinalProperty.kt, 7)
   local    = a: evFinalProperty.A = {evFinalProperty.A@uniqueID} (sp = evFinalProperty.kt, 8)
     field    = prop: int = 1 (sp = evFinalProperty.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
@@ -15,7 +15,7 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 Compile bytecode for a
- frame    = foo:5, A {evFunctionDeclaration}
+ frame    = foo():5, A {evFunctionDeclaration}
   this     = this = {evFunctionDeclaration.A@uniqueID}
     field    = a: int = 1 (sp = evFunctionDeclaration.kt, 3)
   extra    = a
--- a/idea/testData/debugger/tinyApp/outs/evLineRange.out
+++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out
@@ -25,7 +25,7 @@ fun foo(i: Int) {}

 // PRINT_FRAME
 Compile bytecode for a2.prop
- frame    = main:15, EvLineRangeKt {evLineRange}
+ frame    = main():15, EvLineRangeKt {evLineRange}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evLineRange.kt, 7)
   local    = a1: evLineRange.A = {evLineRange.A@uniqueID} (sp = evLineRange.kt, 8)
     field    = prop: int = 1 (sp = evLineRange.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evProperty.out
@@ -18,7 +18,7 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 Compile bytecode for a.prop
- frame    = main:10, EvPropertyKt {evProperty}
+ frame    = main():10, EvPropertyKt {evProperty}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evProperty.kt, 7)
   local    = a: evProperty.A = {evProperty.A@uniqueID} (sp = evProperty.kt, 8)
     field    = prop: int = 1 (sp = evProperty.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
+++ b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
@@ -21,7 +21,7 @@ fun main(args: Array<String>) {

 // PRINT_FRAME
 Compile bytecode for prop
- frame    = test:8, A {evPropertyRefExpr}
+ frame    = test():8, A {evPropertyRefExpr}
   this     = this = {evPropertyRefExpr.A@uniqueID}
     field    = prop: int = 1 (sp = evPropertyRefExpr.kt, 4)
   extra    = prop
--- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
@@ -29,7 +29,7 @@ fun foo(i: Int) {}

 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main:12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
+ frame    = main():12, EvSkipAnonymousObjectKt {evSkipAnonymousObject}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipAnonymousObject.kt, 7)
   local    = a1: evSkipAnonymousObject.A = {evSkipAnonymousObject.A@uniqueID} (sp = evSkipAnonymousObject.kt, 8)
     field    = prop: int = 1 (sp = evSkipAnonymousObject.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
@@ -24,7 +24,7 @@ fun l(f: () -> Unit) {}

 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main:12, EvSkipLambdaKt {evSkipLambda}
+ frame    = main():12, EvSkipLambdaKt {evSkipLambda}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLambda.kt, 7)
   local    = a1: evSkipLambda.A = {evSkipLambda.A@uniqueID} (sp = evSkipLambda.kt, 8)
     field    = prop: int = 1 (sp = evSkipLambda.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
@@ -25,7 +25,7 @@ fun foo(i: Int) {}

 // PRINT_FRAME
 Compile bytecode for a1.prop
- frame    = main:12, EvSkipLocalClassKt {evSkipLocalClass}
+ frame    = main():12, EvSkipLocalClassKt {evSkipLocalClass}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = evSkipLocalClass.kt, 7)
   local    = a1: evSkipLocalClass.A = {evSkipLocalClass.A@uniqueID} (sp = evSkipLocalClass.kt, 8)
     field    = prop: int = 1 (sp = evSkipLocalClass.kt, 4)
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -25,7 +25,7 @@ fun foo(f: () -> Unit) {
 }

 // PRINT_FRAME
- frame    = invoke:11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
+ frame    = invoke():11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject}
   this     = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameAnonymousObject.FrameAnonymousObjectKt$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1@uniqueID} (sp = null)
       field    = obProp: int = 1 (sp = frameAnonymousObject.kt, 6)
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -35,7 +35,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke:16, A$test$1 {frameClassObject}
+ frame    = invoke():16, A$test$1 {frameClassObject}
   this     = this = {frameClassObject.A$test$1@uniqueID}Function0<kotlin.Unit>
     field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
@@ -14,7 +14,7 @@ fun main(args: Array<String>) {
 // EXPRESSION: a
 // RESULT: 1: I

- frame    = main:6, FrameClosingBracketKt {frameClosingBracket}
+ frame    = main():6, FrameClosingBracketKt {frameClosingBracket}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameClosingBracket.kt, 3)
   local    = a: int = 1 (sp = frameClosingBracket.kt, 4)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -83,7 +83,7 @@ fun lambda(f: () -> Unit) {

 // EXPRESSION: bMyFun()
 // RESULT: 1: I
- frame    = invoke:24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
+ frame    = invoke():24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun}
   this     = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameExtFunExtFun.Outer$foo$LocalClass = {frameExtFunExtFun.Outer$foo$LocalClass@uniqueID} (sp = null)
       field    = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 19)
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -27,7 +27,7 @@ fun A.foo() {

 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = foo:14, FrameExtensionFunKt {frameExtensionFun}
+ frame    = foo():14, FrameExtensionFunKt {frameExtensionFun}
   local    = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID} (sp = null)
     field    = prop: int = 1 (sp = frameExtensionFun.kt, 8)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
@@ -28,7 +28,7 @@ class A {
 // RESULT: 1: I


- frame    = main:7, FrameInlineArgumentKt {frameInlineArgument}
+ frame    = main():7, FrameInlineArgumentKt {frameInlineArgument}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameInlineArgument.kt, 3)
   local    = element: int = 1 (sp = frameInlineArgument.kt, 4)
   local    = this_$iv: frameInlineArgument.A = {frameInlineArgument.A@uniqueID} (sp = null)
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
@@ -41,7 +41,7 @@ fun main(args: Array<String>) {

 // EXPRESSION: element
 // RESULT: 1: I
- frame    = bar:16, C {frameInlineArgumentInsideInlineFun}
+ frame    = bar():16, C {frameInlineArgumentInsideInlineFun}
   this     = this = {frameInlineArgumentInsideInlineFun.C@uniqueID}
              - Class has no fields
   local    = element: float = 1.0 (sp = frameInlineArgumentInsideInlineFun.kt, 13)
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
@@ -32,7 +32,7 @@ class A {
 // RESULT: 1: I


- frame    = main:14, FrameInlineFunKt {frameInlineFun}
+ frame    = main():14, FrameInlineFunKt {frameInlineFun}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = null)
   local    = element: int = 1 (sp = frameInlineFun.kt, 12)
   local    = this_$iv: frameInlineFun.A = {frameInlineFun.A@uniqueID} (sp = null)
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
@@ -54,7 +54,7 @@ fun main(args: Array<String>) {
 // RESULT: 1: I


- frame    = bar:7, C {frameInlineFunCallInsideInlineFun}
+ frame    = bar():7, C {frameInlineFunCallInsideInlineFun}
   this     = this = {frameInlineFunCallInsideInlineFun.C@uniqueID}
              - Class has no fields
   local    = element: float = 1.0 (sp = frameInlineFunCallInsideInlineFun.kt, 5)
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -40,7 +40,7 @@ class A {

 // EXPRESSION: myFun2()
 // RESULT: 1: I
- frame    = test:17, A$Inner {frameInnerClass}
+ frame    = test():17, A$Inner {frameInnerClass}
   this     = this = {frameInnerClass.A$Inner@uniqueID}
     field    = prop2: int = 1 (sp = frameInnerClass.kt, 12)
     field    = this$0: frameInnerClass.A = {frameInnerClass.A@uniqueID} (sp = null)
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -32,7 +32,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: val1 + val2
 // RESULT: 2: I
- frame    = invoke:9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
+ frame    = invoke():9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda}
   this     = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}Function0<kotlin.Unit> (sp = null)
       field    = $val1: int = 1 (sp = null)
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: val1
 // RESULT: 1: I
- frame    = invoke:7, FrameLambdaKt$main$1 {frameLambda}
+ frame    = invoke():7, FrameLambdaKt$main$1 {frameLambda}
   this     = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}Function0<kotlin.Unit>
     field    = $val1: int = 1 (sp = null)
     field    = arity: int = 0 (sp = Lambda.!EXT!)
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: val1
 // RESULT: Cannot find local variable: name = val1
- frame    = invoke:7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
+ frame    = invoke():7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed}
   this     = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}Function0<kotlin.Unit>
     field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
@@ -11,7 +11,7 @@ fun main(args: Array<String>) {
 }

 // PRINT_FRAME
- frame    = main:6, FrameLocalVariableKt {frameLocalVariable}
+ frame    = main():6, FrameLocalVariableKt {frameLocalVariable}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameLocalVariable.kt, 3)
   local    = val1: int = 1 (sp = frameLocalVariable.kt, 4)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -29,7 +29,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: O.obMyFun()
 // RESULT: 1: I
- frame    = invoke:6, FrameObjectKt$main$1 {frameObject}
+ frame    = invoke():6, FrameObjectKt$main$1 {frameObject}
   this     = this = {frameObject.FrameObjectKt$main$1@uniqueID}Function0<kotlin.Unit>
     field    = arity: int = 0 (sp = Lambda.!EXT!)
 Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -21,7 +21,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = invoke:7, FrameSharedVarKt$main$1 {frameSharedVar}
+ frame    = invoke():7, FrameSharedVarKt$main$1 {frameSharedVar}
   this     = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}Function0<kotlin.Unit>
     field    = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null)
       field    = element: int = 1 (sp = Ref.!EXT!)
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -21,7 +21,7 @@ inline fun foo(f: () -> Unit) {

 // EXPRESSION: var1
 // RESULT: 1: I
- frame    = main:7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
+ frame    = main():7, FrameSharedVarLocalVarKt {frameSharedVarLocalVar}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSharedVarLocalVar.kt, 3)
   local    = var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = frameSharedVarLocalVar.kt, 4)
     field    = element: int = 1 (sp = Ref.!EXT!)
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -32,7 +32,7 @@ class MyClass

 // EXPRESSION: val1 + topVal1
 // RESULT: 2: I
- frame    = main:9, FrameSimpleKt {frameSimple}
+ frame    = main():9, FrameSimpleKt {frameSimple}
   static   = static = frameSimple.FrameSimpleKt
     field    = topVal1: int = 1 (sp = frameSimple.kt, 3)
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = frameSimple.kt, 5)
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -47,7 +47,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke:16, A$test$1 {frameThis0}
+ frame    = invoke():16, A$test$1 {frameThis0}
   this     = this = {frameThis0.A$test$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameThis0.A = {frameThis0.A@uniqueID} (sp = null)
       field    = prop1: int = 1 (sp = frameThis0.kt, 8)
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -63,7 +63,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: myFun2()
 // RESULT: 1: I
- frame    = invoke:15, A$testExt$1 {frameThis0Ext}
+ frame    = invoke():15, A$testExt$1 {frameThis0Ext}
   this     = this = {frameThis0Ext.A$testExt$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameThis0Ext.A = {frameThis0Ext.A@uniqueID} (sp = null)
       field    = prop1: int = 1 (sp = frameThis0Ext.kt, 8)
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -49,7 +49,7 @@ fun foo(f: () -> Unit) {

 // EXPRESSION: myFun()
 // RESULT: 1: I
- frame    = invoke:17, A$test$1$1 {frameThis0This0}
+ frame    = invoke():17, A$test$1$1 {frameThis0This0}
   this     = this = {frameThis0This0.A$test$1$1@uniqueID}Function0<kotlin.Unit>
     field    = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}Function0<kotlin.Unit> (sp = null)
       field    = this$0: frameThis0This0.A = {frameThis0This0.A@uniqueID} (sp = null)
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
@@ -7,7 +7,7 @@ syntheticMethods.kt:19
 syntheticMethods.kt:20
 syntheticMethods.kt:17
 syntheticMethods.kt:7
-syntheticMethods.kt:-1
+syntheticMethods.kt:0
 syntheticMethods.kt:7
 syntheticMethods.kt:25
 syntheticMethods.kt:31
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
@@ -5,7 +5,7 @@ syntheticMethodsSkip.kt:6
 syntheticMethodsSkip.kt:19
 syntheticMethodsSkip.kt:20
 syntheticMethodsSkip.kt:7
-syntheticMethodsSkip.kt:-1
+syntheticMethodsSkip.kt:0
 syntheticMethodsSkip.kt:7
 syntheticMethodsSkip.kt:25
 syntheticMethodsSkip.kt:31
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -16,7 +16,7 @@ class A {

 // PRINT_FRAME
 Compile bytecode for args.size
- frame    = main:6, ToStringRendererKt {toStringRenderer}
+ frame    = main():6, ToStringRendererKt {toStringRenderer}
   local    = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = toStringRenderer.kt, 3)
   local    = a: toStringRenderer.A = {toStringRenderer.A@uniqueID}myA (sp = toStringRenderer.kt, 4)
              - Class has no fields
--- a/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
@@ -1,3 +1,3 @@
-New instance creation 12 J(2)
-Supertype 7 class B: J(1) {
-Unclassified usage 2 constructor(): super(1) {
+New instance creation (12: 5) J(2)
+Supertype (7: 10) class B: J(1) {
+Unclassified usage (2: 20) constructor(): super(1) {
--- a/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
@@ -1,4 +1,4 @@
-New instance creation 16 J()
-Supertype 11 class B: J() {
-Unclassified usage 2 constructor(i: Int): super() {
-Unclassified usage 6 constructor() {
+New instance creation (16: 5) J()
+Supertype (11: 10) class B: J() {
+Unclassified usage (2: 26) constructor(i: Int): super() {
+Unclassified usage (6: 18) constructor() {
--- a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
@@ -1,6 +1,6 @@
-[primaryConstructorByJavaRef.0.java] New instance creation 12 new A(1);
-[primaryConstructorByJavaRef.0.java] Unclassified usage 7 super(n);
-[primaryConstructorByJavaRef.1.kt] New instance creation 13 A(1)
-[primaryConstructorByJavaRef.1.kt] Supertype 9 class C(): A(1)
-[primaryConstructorByJavaRef.1.kt] Unclassified usage 2 constructor(): this(1)
-[primaryConstructorByJavaRef.1.kt] Unclassified usage 6 constructor(n: Int): super(n)
+[primaryConstructorByJavaRef.0.java] New instance creation (12: 13) new A(1);
+[primaryConstructorByJavaRef.0.java] Unclassified usage (7: 9) super(n);
+[primaryConstructorByJavaRef.1.kt] New instance creation (13: 5) A(1)
+[primaryConstructorByJavaRef.1.kt] Supertype (9: 12) class C(): A(1)
+[primaryConstructorByJavaRef.1.kt] Unclassified usage (2: 20) constructor(): this(1)
+[primaryConstructorByJavaRef.1.kt] Unclassified usage (6: 26) constructor(n: Int): super(n)
--- a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
@@ -1,6 +1,6 @@
-[primaryConstructorByJavaSuperRef.0.java] New instance creation 12 new A(1);
-[primaryConstructorByJavaSuperRef.0.java] Unclassified usage 7 super(n);
-[primaryConstructorByJavaSuperRef.1.kt] New instance creation 13 A(1)
-[primaryConstructorByJavaSuperRef.1.kt] Supertype 9 class C(): A(1)
-[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage 2 constructor(): this(1)
-[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage 6 constructor(n: Int): super(n)
+[primaryConstructorByJavaSuperRef.0.java] New instance creation (12: 13) new A(1);
+[primaryConstructorByJavaSuperRef.0.java] Unclassified usage (7: 9) super(n);
+[primaryConstructorByJavaSuperRef.1.kt] New instance creation (13: 5) A(1)
+[primaryConstructorByJavaSuperRef.1.kt] Supertype (9: 12) class C(): A(1)
+[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage (2: 20) constructor(): this(1)
+[primaryConstructorByJavaSuperRef.1.kt] Unclassified usage (6: 26) constructor(n: Int): super(n)
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructorByJavaNewExpression.0.java] New instance creation 10 new B("");
-[secondaryConstructorByJavaNewExpression.0.java] Unclassified usage 6 super("");
-[secondaryConstructorByJavaNewExpression.1.kt] New instance creation 22 B("")
-[secondaryConstructorByJavaNewExpression.1.kt] Supertype 17 class C : B("") {
-[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage 12 constructor(a: Int) : super("") {
-[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage 2 constructor(): this("") {
+[secondaryConstructorByJavaNewExpression.0.java] New instance creation (10: 13) new B("");
+[secondaryConstructorByJavaNewExpression.0.java] Unclassified usage (6: 9) super("");
+[secondaryConstructorByJavaNewExpression.1.kt] New instance creation (22: 5) B("")
+[secondaryConstructorByJavaNewExpression.1.kt] Supertype (17: 11) class C : B("") {
+[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage (12: 27) constructor(a: Int) : super("") {
+[secondaryConstructorByJavaNewExpression.1.kt] Unclassified usage (2: 20) constructor(): this("") {
--- a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
+++ b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructorByJavaSuperCall.0.java] New instance creation 10 new B("");
-[secondaryConstructorByJavaSuperCall.0.java] Unclassified usage 6 super("");
-[secondaryConstructorByJavaSuperCall.1.kt] New instance creation 22 B("")
-[secondaryConstructorByJavaSuperCall.1.kt] Supertype 17 class C : B("") {
-[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage 12 constructor(a: Int) : super("") {
-[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage 2 constructor(): this("") {
+[secondaryConstructorByJavaSuperCall.0.java] New instance creation (10: 13) new B("");
+[secondaryConstructorByJavaSuperCall.0.java] Unclassified usage (6: 9) super("");
+[secondaryConstructorByJavaSuperCall.1.kt] New instance creation (22: 5) B("")
+[secondaryConstructorByJavaSuperCall.1.kt] Supertype (17: 11) class C : B("") {
+[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage (12: 27) constructor(a: Int) : super("") {
+[secondaryConstructorByJavaSuperCall.1.kt] Unclassified usage (2: 20) constructor(): this("") {
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type 2 var next: A? = A()
-Function return types 15 fun getNext(): A? {
-Function return types 36 fun Any.toA(): A? {
-Local variable declaration 11 val aa: A = a
-Nested class/object 1 public class X(bar: String? = A.BAR): A() {
-Nested class/object 3 val myBar: String? = A.BAR
-Nested class/object 6 A.BAR = ""
-Nested class/object 7 A.foos()
-New instance creation 2 var next: A? = A()
-New instance creation 32 fun X.bar(a: A = A()) {
-Parameter type 10 fun foo(a: A) {
-Parameter type 32 fun X.bar(a: A = A()) {
-Super type qualifier 20 super<A>.foo()
-Supertype 1 public class X(bar: String? = A.BAR): A() {
-Supertype 23 companion object: A() {
-Supertype 28 object O: A() {
-Target type of 'is' operation 37 return if (this is A) this as A else null
-Usage in cast target type 37 return if (this is A) this as A else null
+Class/object property type (2: 15) var next: A? = A()
+Function return types (15: 20) fun getNext(): A? {
+Function return types (36: 16) fun Any.toA(): A? {
+Local variable declaration (11: 17) val aa: A = a
+Nested class/object (1: 31) public class X(bar: String? = A.BAR): A() {
+Nested class/object (3: 26) val myBar: String? = A.BAR
+Nested class/object (6: 9) A.BAR = ""
+Nested class/object (7: 9) A.foos()
+New instance creation (2: 20) var next: A? = A()
+New instance creation (32: 18) fun X.bar(a: A = A()) {
+Parameter type (10: 16) fun foo(a: A) {
+Parameter type (32: 14) fun X.bar(a: A = A()) {
+Super type qualifier (20: 15) super<A>.foo()
+Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
+Supertype (23: 23) companion object: A() {
+Supertype (28: 11) object O: A() {
+Target type of 'is' operation (37: 24) return if (this is A) this as A else null
+Usage in cast target type (37: 35) return if (this is A) this as A else null
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 public interface T: A
-Unclassified usage 4 val a = object: A() {}
-Unclassified usage 7 val b = object: T {}
+Unclassified usage (2: 22) public interface T: A
+Unclassified usage (4: 13) val a = object: A() {}
+Unclassified usage (7: 17) val b = object: T {}
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 1 public open class X: A()
-Unclassified usage 3 public interface T: A
-Unclassified usage 5 public open class Y: X()
-Unclassified usage 7 public class Z: Y(), T
+Unclassified usage (1: 19) public open class X: A()
+Unclassified usage (3: 18) public interface T: A
+Unclassified usage (5: 19) public open class Y: X()
+Unclassified usage (7: 14) public class Z: Y(), T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 2 public open class X: A()
-Unclassified usage 4 public interface T: A
-Unclassified usage 7 public open class Y: X()
-Unclassified usage 9 public class Z: Y(), T
+Unclassified usage (2: 23) public open class X: A()
+Unclassified usage (4: 22) public interface T: A
+Unclassified usage (7: 27) public open class Y: X()
+Unclassified usage (9: 22) public class Z: Y(), T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 public interface T: A
-Unclassified usage 4 public object O1: A()
-Unclassified usage 7 public object O2: T
+Unclassified usage (2: 22) public interface T: A
+Unclassified usage (4: 19) public object O1: A()
+Unclassified usage (7: 23) public object O2: T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 2 public open class X: A()
-Unclassified usage 4 public interface T: A
-Unclassified usage 7 public open class Y: X()
-Unclassified usage 9 public class Z: Y(), T
+Unclassified usage (2: 23) public open class X: A()
+Unclassified usage (4: 22) public interface T: A
+Unclassified usage (7: 27) public open class Y: X()
+Unclassified usage (9: 22) public class Z: Y(), T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 public interface T: A
-Unclassified usage 4 public object O1: A()
-Unclassified usage 7 public object O2: T
+Unclassified usage (2: 22) public interface T: A
+Unclassified usage (4: 19) public object O1: A()
+Unclassified usage (7: 23) public object O2: T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 1 public interface T: A
-Unclassified usage 3 public object O1: A()
-Unclassified usage 5 public object O2: T
+Unclassified usage (1: 18) public interface T: A
+Unclassified usage (3: 15) public object O1: A()
+Unclassified usage (5: 15) public object O2: T
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
@@ -1,4 +1,4 @@
-Value read 1 public class X(bar: String? = A.BAR): A() {
-Value read 3 val myBar: String? = A.BAR
-Value write 12 aa.bar = ""
-Value write 6 A.BAR = ""
+Value read (1: 33) public class X(bar: String? = A.BAR): A() {
+Value read (3: 28) val myBar: String? = A.BAR
+Value write (12: 12) aa.bar = ""
+Value write (6: 11) A.BAR = ""
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
@@ -1,7 +1,7 @@
-Function call 20 super<A>.foo()
-Function call 7 A.foos()
-New instance creation 2 var next: A? = A()
-New instance creation 32 fun X.bar(a: A = A()) {
-Supertype 1 public class X(bar: String? = A.BAR): A() {
-Supertype 23 companion object: A() {
-Supertype 28 object O: A() {
+Function call (20: 18) super<A>.foo()
+Function call (7: 11) A.foos()
+New instance creation (2: 20) var next: A? = A()
+New instance creation (32: 18) fun X.bar(a: A = A()) {
+Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
+Supertype (23: 23) companion object: A() {
+Supertype (28: 11) object O: A() {
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type 2 var next: A? = A()
-Function return types 15 fun getNext(): A? {
-Function return types 36 fun Any.toA(): A? {
-Local variable declaration 11 val aa: A = a
-Nested class/object 1 public class X(bar: String? = A.BAR): A() {
-Nested class/object 3 val myBar: String? = A.BAR
-Nested class/object 6 A.BAR = ""
-Nested class/object 7 A.foos()
-New instance creation 2 var next: A? = A()
-New instance creation 32 fun X.bar(a: A = A()) {
-Parameter type 10 fun foo(a: A) {
-Parameter type 32 fun X.bar(a: A = A()) {
-Super type qualifier 20 super<A>.foo()
-Supertype 1 public class X(bar: String? = A.BAR): A() {
-Supertype 23 companion object: A() {
-Supertype 28 object O: A() {
-Target type of 'is' operation 37 return if (this is A) this as A else null
-Usage in cast target type 37 return if (this is A) this as A else null
+Class/object property type (2: 15) var next: A? = A()
+Function return types (15: 20) fun getNext(): A? {
+Function return types (36: 16) fun Any.toA(): A? {
+Local variable declaration (11: 17) val aa: A = a
+Nested class/object (1: 31) public class X(bar: String? = A.BAR): A() {
+Nested class/object (3: 26) val myBar: String? = A.BAR
+Nested class/object (6: 9) A.BAR = ""
+Nested class/object (7: 9) A.foos()
+New instance creation (2: 20) var next: A? = A()
+New instance creation (32: 18) fun X.bar(a: A = A()) {
+Parameter type (10: 16) fun foo(a: A) {
+Parameter type (32: 14) fun X.bar(a: A = A()) {
+Super type qualifier (20: 15) super<A>.foo()
+Supertype (1: 39) public class X(bar: String? = A.BAR): A() {
+Supertype (23: 23) companion object: A() {
+Supertype (28: 11) object O: A() {
+Target type of 'is' operation (37: 24) return if (this is A) this as A else null
+Usage in cast target type (37: 35) return if (this is A) this as A else null
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
@@ -1 +1 @@
-Unclassified usage 3 public interface T: A
+Unclassified usage (3: 18) public interface T: A
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
@@ -1,15 +1,15 @@
-Class/object property type 3 var next: Outer.A? = (this@KOuter as Outer).A()
-Function return types 15 fun getNext(): Outer.A? {
-Function return types 29 fun Any.toA(): Outer.A? {
-Local variable declaration 11 val aa: Outer.A = a
-New instance creation 2 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-New instance creation 25 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-New instance creation 3 var next: Outer.A? = (this@KOuter as Outer).A()
-New instance creation 4 val myBar: String? = (this@KOuter as Outer).A().bar
-New instance creation 7 (this@KOuter as Outer).A().bar = ""
-Parameter type 10 fun foo(a: Outer.A) {
-Parameter type 25 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-Super type qualifier 20 super<Outer.A>.foo()
-Supertype 2 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-Target type of 'is' operation 30 return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type 30 return if (this is Outer.A) this as Outer.A else null
+Class/object property type (3: 25) var next: Outer.A? = (this@KOuter as Outer).A()
+Function return types (15: 30) fun getNext(): Outer.A? {
+Function return types (29: 22) fun Any.toA(): Outer.A? {
+Local variable declaration (11: 27) val aa: Outer.A = a
+New instance creation (25: 39) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+New instance creation (2: 64) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+New instance creation (3: 53) var next: Outer.A? = (this@KOuter as Outer).A()
+New instance creation (4: 53) val myBar: String? = (this@KOuter as Outer).A().bar
+New instance creation (7: 36) (this@KOuter as Outer).A().bar = ""
+Parameter type (10: 26) fun foo(a: Outer.A) {
+Parameter type (25: 27) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+Super type qualifier (20: 25) super<Outer.A>.foo()
+Supertype (2: 80) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+Target type of 'is' operation (30: 30) return if (this is Outer.A) this as Outer.A else null
+Usage in cast target type (30: 47) return if (this is Outer.A) this as Outer.A else null
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stanislav Erokhin	bf131664d3	Fixed IDEA plugin test on Java 8. If you want to run such test locally, you should set up environment variable JDK8_PATH to /usr/lib/jvm/java-8-oracle/jre or something like that. Build server also should have such environment variable.	2016-06-30 18:29:28 +03:00
Nikolay Krasko	454e692861	Restrict unit with 145.256 (cherry picked from commit `66494e1`)	2016-06-30 18:29:28 +03:00
Nikolay Krasko	21c715df5c	Find usage test data update in spring tests (cherry picked from commit `ebfb08b`)	2016-06-30 18:29:27 +03:00
Nikolay Krasko	68c019330e	More updates in test data (cherry picked from commit `a51f555`)	2016-06-30 18:29:27 +03:00
Nikolay Krasko	f8fcf7091a	Revert "Template for Junit4 framework doesn't have test prefix anymore" This reverts commit `ee9962ed70`. (cherry picked from commit `2d3da55`)	2016-06-30 18:29:26 +03:00
Nikolay Krasko	f7bf94e43e	Update test data (cherry picked from commit `4f980f4`)	2016-06-30 18:29:26 +03:00
Nikolay Krasko	55f39df3b6	Revert ""Run Test" line markers now wrap the function names. Additional marker on abstract class." This reverts commit `a642a15947`. (cherry picked from commit `0d6a5f4`)	2016-06-30 18:29:25 +03:00
Nikolay Krasko	a3c5c15cb3	Revert "Temporary ad-hock jps-tests enable with testdata modification" This reverts commit `46a1028494`. (cherry picked from commit `06b7fad`)	2016-06-30 18:29:24 +03:00
Nikolay Krasko	cc2b29a38c	Revert using 2016.1 color properties (cherry picked from commit `13d770c`)	2016-06-30 18:29:24 +03:00
Nikolay Krasko	dd07dccb0c	Disable write action for intention test start 2016.1 doesn't start actions by default and run isAvailable in pooled thread With write action tests won't proccess as it's imposible to take read action from pooled thread. Problem introduce in `3c97ae4c5c` (cherry picked from commit `8a1fa27`)	2016-06-30 18:29:23 +03:00
Nikolay Krasko	5ed068bf86	Workaround failure on windows because of loading swin components in DesignerToolWindowManager https://intellij-support.jetbrains.com/hc/en-us/community/posts/207331295-Headless-plugin-in-IJ-15-crashes-fine-in-IJ-14 (cherry picked from commit `6157d3d`)	2016-06-30 18:29:23 +03:00
Nikolay Krasko	2da4a90099	Revert "Update since to IDEA 2016.1" This reverts commit `74091a12cf`. (cherry picked from commit `3b0c4d2`)	2016-06-30 18:29:22 +03:00
Nikolay Krasko	b6143e7dee	Revert configuration for kotlin-version (cherry picked from commit `77434d6`)	2016-06-30 18:29:22 +03:00
Nikolay Krasko	cfe5dfe54d	Revert "Update test data in debugger tests" This reverts commit `37b6849d31`. (cherry picked from commit `8671c04`)	2016-06-30 18:29:21 +03:00
Nikolay Krasko	1afbd97784	Revert "Mass test data update: find usages doesn't contain column anymore" This reverts commit `a71d1c24ff`. (cherry picked from commit `6319469`)	2016-06-30 18:29:19 +03:00
Nikolay Krasko	76275682f0	Disable KotlinSpringModelDependenciesLineMarkerProvider as it based on absent base class in idea 143. (cherry picked from commit `361dd04`)	2016-06-30 18:27:47 +03:00
Nikolay Krasko	7c0c20e10a	Revert "Remove MaxPermSize parameter" This reverts commit `5f7f46ff6c`. (cherry picked from commit `77fc2d8`)	2016-06-30 18:27:46 +03:00
Nikolay Krasko	b39c3cc68d	Remove usage API specific to Idea 2016.1 (cherry picked from commit `2565f57`)	2016-06-30 18:27:46 +03:00
Nikolay Krasko	288784797b	Revert more modules for using java 1.6 (cherry picked from commit `28f12ed`)	2016-06-30 18:27:45 +03:00
Nikolay Krasko	e73ad3dbda	Revert more modules for using java 1.6 (cherry picked from commit `b131e56`)	2016-06-30 18:27:45 +03:00
Nikolay Krasko	584f9892fe	Remove using 1.8 jdk (cherry picked from commit `837a010`)	2016-06-30 18:27:44 +03:00
Stanislav Erokhin	92db7f260c	Revert "Fix compilation against new version of Android plugin" This reverts commit `9cd8c2b7bd`. (cherry picked from commit `c03e1ba`)	2016-06-30 18:27:43 +03:00
Nikolay Krasko	0b708d21e8	Revert "Update undroid test clean up" This reverts commit `b6f3bf9869`. (cherry picked from commit `52271fc`)	2016-06-30 18:27:43 +03:00
Nikolay Krasko	0a68572223	Revert "Fix compile errors in AbstractKotlinEvaluateExpressionTest.kt" This reverts commit `0d9e586628`. (cherry picked from commit `2546e22`)	2016-06-30 18:27:42 +03:00
Nikolay Krasko	01ffe32e8d	Revert "Fix compilation against new version of Android plugin" This reverts commit `9cd8c2b7bd`. (cherry picked from commit `c03e1ba`)	2016-06-30 18:27:42 +03:00
Stanislav Erokhin	04e5baca5b	Revert update_dependencies.xml to using 143 idea (cherry picked from commit `4ed1be3431`)	2016-06-30 18:27:41 +03:00