Automerge '1.0.3'
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0aca5a0..3228cb3 100644
--- 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>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml b/.idea/runConfigurations/All_IDEA_Plugin_Tests.xml
index e59f867..8eede5e 100644
--- 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" />
diff --git a/.idea/runConfigurations/All_Non_Compiler_Tests.xml b/.idea/runConfigurations/All_Non_Compiler_Tests.xml
index c5f0472..96d7330 100644
--- 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" />
diff --git a/.idea/runConfigurations/All_in_jps_tests.xml b/.idea/runConfigurations/All_in_jps_tests.xml
index 10f2d2d..d62bb60 100644
--- 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" />
diff --git a/.idea/runConfigurations/Android_Studio.xml b/.idea/runConfigurations/Android_Studio.xml
index 20311d5..f52c5a1 100644
--- 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" />
diff --git a/.idea/runConfigurations/Codegen_Tests_on_Android.xml b/.idea/runConfigurations/Codegen_Tests_on_Android.xml
index d4a52e8..90c39e2 100644
--- 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" />
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
index e0818cd..f27978a 100644
--- 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" />
diff --git a/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml b/.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml
index 7c0f259..fb248ee 100644
--- 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" />
diff --git a/.idea/runConfigurations/J2K_Tests.xml b/.idea/runConfigurations/J2K_Tests.xml
index ca87814..87ee860 100644
--- 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" />
diff --git a/.idea/runConfigurations/Js_backend_tests.xml b/.idea/runConfigurations/Js_backend_tests.xml
index 9d2a7ca1..45c15ac 100644
--- 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" />
diff --git a/.idea/runConfigurations/Smart_Completion_Tests.xml b/.idea/runConfigurations/Smart_Completion_Tests.xml
index 0d07442..fb0d2bf 100644
--- 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" />
diff --git a/.idea/runConfigurations/Update_Dist_Run.xml b/.idea/runConfigurations/Update_Dist_Run.xml
index 83913bb..1d7ea82 100644
--- 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" />
diff --git a/android-studio/android-studio.iml b/android-studio/android-studio.iml
index 6816835..1fdc80d 100644
--- 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" />
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
index 476f0ab..1f52397 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
index a56d30e..dc3c8ab 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt
index 2e3f2dc..898eb11 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/callableReferences/CallableReferencesResolutionUtils.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.kt
index 400f1d4..13c0136 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
index 08af694..b99d45d 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java
@@ -121,7 +121,7 @@
}
private Disposable createDisposable(String debugName) {
- Disposable disposable = Disposer.newDisposable("CompileDisposable" + debugName);
+ Disposable disposable = Disposer.newDisposable();
Disposer.register(getTestRootDisposable(), disposable);
return disposable;
}
diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java
index 64f1dcf..b279800 100644
--- 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 @@
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
diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java
index e53eebf..fb9bcae 100644
--- 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 @@
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;
}
diff --git a/compiler/tests-java8/compiler-tests-java8.iml b/compiler/tests-java8/compiler-tests-java8.iml
index 5b2c081..dad2796 100644
--- 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" />
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 334d5a9..9f22c2b 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -42,7 +42,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../dependencies/download/idea-for-compiler-test/idea_rt.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../ideaSDK/lib/idea_rt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -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/openapi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
index 80e7338..28874d4 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
index acfc403..564f344 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
index dcf1d6a..13ba015 100644
--- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea-runner/idea-runner.iml b/idea-runner/idea-runner.iml
index 1276de3..b9390e7 100644
--- 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" />
diff --git a/idea/formatter/formatter.iml b/idea/formatter/formatter.iml
index efaee3d..812d04b 100644
--- 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" />
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 8a992c3..20e1492 100644
--- 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" />
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
index 249c17f..6598c74 100644
--- 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 @@
// 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);
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
index 482806f..66a3e4b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/KtSimpleNameReference.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/idea-android/idea-android.iml b/idea/idea-android/idea-android.iml
index 2342de6..3b3532e 100644
--- 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" />
diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml
index ff92562..10bac7a 100644
--- 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" />
diff --git a/idea/idea-core/idea-core.iml b/idea/idea-core/idea-core.iml
index 9bcf255..890441b 100644
--- 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" />
diff --git a/idea/idea-live-templates/idea-live-templates.iml b/idea/idea-live-templates/idea-live-templates.iml
index f275ba7..b3432a1 100644
--- 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" />
diff --git a/idea/idea-maven/idea-maven.iml b/idea/idea-maven/idea-maven.iml
index 6ed9a20..6c21196 100644
--- 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" />
diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/MavenTestCase.java
index 49e650a..f5ff3ba 100644
--- 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 @@
protected void tearDown() throws Exception {
try {
MavenServerManager.getInstance().shutdown(true);
- MavenArtifactDownloader.awaitQuiescence(100, TimeUnit.SECONDS);
myProject = null;
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
diff --git a/idea/idea-repl/idea-repl.iml b/idea/idea-repl/idea-repl.iml
index 89c3d98..e1dfc45 100644
--- 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" />
diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml
index b5c20c1..33ca93b 100644
--- 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" />
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java
index bf953a1..4aa201d 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/idea.iml b/idea/idea.iml
index 7b5ac27..dac5ca0 100644
--- 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" />
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 42fa5ea..51da725 100644
--- 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>
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
index dbf77e7..0d5bccd4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt
index 7a9ecf8..8540122 100644
--- 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 @@
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
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinMoveLeftRightHandler.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinMoveLeftRightHandler.kt
index 90f6def..58230db 100644
--- 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 @@
return emptyArray()
}
}
+
+*/
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
index cf7041a..1892948 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
@@ -69,8 +69,8 @@
.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))
}
}
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index cf3ba78..c5f7208 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt b/idea/src/org/jetbrains/kotlin/idea/filters/InlineFunctionHyperLinkInfo.kt
index 314b3bd..155c752 100644
--- 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 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 @@
clear()
if (value != null) {
- append(value.prefix)
+ append((value as InlineInfo).prefix)
}
if (isSelected) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
index 4fbe3ff..c044523 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinJUnitStaticEntryPoint.kt
index 9c05b31..756bab9 100644
--- 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.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 @@
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 &&
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt
index 05afec7..c10bc22 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 3e67c7d..28dd36a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
index 0bc9334..f42fa28 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt
index c4f3017..2dd4dc0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticVariableRenamer.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
index da48e27..a5cace8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
index 31d8099..f7ba131 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
index d2107f3..320df36 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
index 2d7177d..7f63205 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameOnSecondaryConstructorHandler.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
index f128e1d..efbed79 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 3c4faf8..f45a231 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
index a5ba54d..7a0c1e5 100644
--- a/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/idea/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -4,7 +4,7 @@
// 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.
}
}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/idea/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index c6065ba..b5d5226 100644
--- 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.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.
}
}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt b/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
index 0f9da35..daa0256 100644
--- a/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
@@ -4,23 +4,23 @@
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() {
}
}
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
index 1cb1a4f..6ad0656 100644
--- a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
@@ -3,23 +3,23 @@
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() {
}
}
\ No newline at end of file
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
index 616e1ec..c2c53bd 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out
@@ -31,7 +31,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
index 45c4123..057b0f6 100644
--- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out
@@ -25,7 +25,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
index 30d56c1..e3e3078 100644
--- a/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evBreakpointOnPropertyDeclaration.out
@@ -21,7 +21,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
index fede641..e4aba27 100644
--- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out
@@ -18,7 +18,7 @@
}
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
index d54107e..0946af6 100644
--- a/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
+++ b/idea/testData/debugger/tinyApp/outs/evDuplicateItems.out
@@ -16,7 +16,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
index 2ddc99c..dd868c4 100644
--- a/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evFinalProperty.out
@@ -15,7 +15,7 @@
}
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
index 560d187..a182a4f 100644
--- a/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
+++ b/idea/testData/debugger/tinyApp/outs/evFunctionDeclaration.out
@@ -15,7 +15,7 @@
// 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
diff --git a/idea/testData/debugger/tinyApp/outs/evLineRange.out b/idea/testData/debugger/tinyApp/outs/evLineRange.out
index b3689c7..51d1666 100644
--- a/idea/testData/debugger/tinyApp/outs/evLineRange.out
+++ b/idea/testData/debugger/tinyApp/outs/evLineRange.out
@@ -25,7 +25,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evProperty.out b/idea/testData/debugger/tinyApp/outs/evProperty.out
index f7eb8ed..751f309 100644
--- a/idea/testData/debugger/tinyApp/outs/evProperty.out
+++ b/idea/testData/debugger/tinyApp/outs/evProperty.out
@@ -18,7 +18,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
index 4669ebd..88a5586 100644
--- a/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
+++ b/idea/testData/debugger/tinyApp/outs/evPropertyRefExpr.out
@@ -21,7 +21,7 @@
// 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
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
index 48504b9..107733c 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipAnonymousObject.out
@@ -29,7 +29,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
index efa5fdc..68cb906 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLambda.out
@@ -24,7 +24,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
index 3b06d63..c98d214 100644
--- a/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
+++ b/idea/testData/debugger/tinyApp/outs/evSkipLocalClass.out
@@ -25,7 +25,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
index 760ef02..f71b694 100644
--- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out
@@ -25,7 +25,7 @@
}
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
index e07c657..7d6ebde 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out
@@ -35,7 +35,7 @@
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
index f9f363f..0842c5c 100644
--- a/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
+++ b/idea/testData/debugger/tinyApp/outs/frameClosingBracket.out
@@ -14,7 +14,7 @@
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
index 383951c..035fac7 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out
@@ -83,7 +83,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
index 52d11d3..6dd0294 100644
--- a/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameExtensionFun.out
@@ -27,7 +27,7 @@
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
index f41f119..f5502f3 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgument.out
@@ -28,7 +28,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
index cf2442e..c87f8fa 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineArgumentInsideInlineFun.out
@@ -41,7 +41,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
index 2873bed..2c2184a 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFun.out
@@ -32,7 +32,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
index 645aa07..3d20f82 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInlineFunCallInsideInlineFun.out
@@ -54,7 +54,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
index 3a87abd..1fbf71f 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerClass.out
@@ -40,7 +40,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
index 2af8e80..71eea33 100644
--- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out
@@ -32,7 +32,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out
index ce23e71..27c9dcc 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambda.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out
@@ -21,7 +21,7 @@
// 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!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
index 8103ced..c8b9f50 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out
@@ -21,7 +21,7 @@
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
index c3069bb..98bbf45 100644
--- a/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
+++ b/idea/testData/debugger/tinyApp/outs/frameLocalVariable.out
@@ -11,7 +11,7 @@
}
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out
index 57c576b..91902d6 100644
--- a/idea/testData/debugger/tinyApp/outs/frameObject.out
+++ b/idea/testData/debugger/tinyApp/outs/frameObject.out
@@ -29,7 +29,7 @@
// 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'
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
index 4892809..c716aee 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out
@@ -21,7 +21,7 @@
// 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!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
index 8cdb83b..aa046bd 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSharedVarLocalVar.out
@@ -21,7 +21,7 @@
// 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!)
diff --git a/idea/testData/debugger/tinyApp/outs/frameSimple.out b/idea/testData/debugger/tinyApp/outs/frameSimple.out
index 369d1f9..cc34cd5 100644
--- a/idea/testData/debugger/tinyApp/outs/frameSimple.out
+++ b/idea/testData/debugger/tinyApp/outs/frameSimple.out
@@ -32,7 +32,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out
index 65111d4..64f3d06 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out
@@ -47,7 +47,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
index 106e274..c861ec9 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out
@@ -63,7 +63,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
index 363eec1..5479351 100644
--- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
+++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out
@@ -49,7 +49,7 @@
// 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)
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
index eb1407f..ce7b422 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethods.out
@@ -7,7 +7,7 @@
syntheticMethods.kt:20
syntheticMethods.kt:17
syntheticMethods.kt:7
-syntheticMethods.kt:-1
+syntheticMethods.kt:0
syntheticMethods.kt:7
syntheticMethods.kt:25
syntheticMethods.kt:31
diff --git a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
index 477e8285..e6ecc2e 100644
--- a/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
+++ b/idea/testData/debugger/tinyApp/outs/syntheticMethodsSkip.out
@@ -5,7 +5,7 @@
syntheticMethodsSkip.kt:19
syntheticMethodsSkip.kt:20
syntheticMethodsSkip.kt:7
-syntheticMethodsSkip.kt:-1
+syntheticMethodsSkip.kt:0
syntheticMethodsSkip.kt:7
syntheticMethodsSkip.kt:25
syntheticMethodsSkip.kt:31
diff --git a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
index 29eab11..c8801c5 100644
--- a/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
+++ b/idea/testData/debugger/tinyApp/outs/toStringRenderer.out
@@ -16,7 +16,7 @@
// 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
diff --git a/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/javaConstructorInDelegationCall.results.txt
index 965dba8..619a2a1 100644
--- 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) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/javaDefaultConstructorInDelegationCall.results.txt
index 3f6c879..d686b42 100644
--- 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() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaRef.results.txt
index 4409eed..3ce30d8 100644
--- 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)
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt b/idea/testData/findUsages/java/findConstructorUsages/primaryConstructorByJavaSuperRef.results.txt
index aa0a7e1..2bdabd1 100644
--- 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)
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaNewExpression.results.txt
index 9c9606b..708badf 100644
--- 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("") {
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt b/idea/testData/findUsages/java/findConstructorUsages/secondaryConstructorByJavaSuperCall.results.txt
index cd0744f..20002d5 100644
--- 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("") {
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.results.txt
index 2cfc991..998d39e 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.results.txt
index ae2397c..2b9e026 100644
--- 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 {}
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
index f635d82..2e3cceb 100644
--- 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
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
index 93635d5..80894b8 100644
--- 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
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.results.txt
index c1c1ca1..d4f5c49 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
index 93635d5..80894b8 100644
--- 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
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.results.txt
index c1c1ca1..6de4df2 100644
--- 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
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.results.txt
index 883a643..a785291 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.results.txt
index e1a8c87..c242079 100644
--- 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 = ""
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.results.txt
index 3c5b3a2..ebc29f9 100644
--- 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() {
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.results.txt
index 2cfc991..998d39e 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
index b54823d..3dc3b84 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.results.txt
index 022ea46..d550fef 100644
--- 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
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
index 311db3e..df30581 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 open class X: A
-Unclassified usage 4 val a = object: A
-Unclassified usage 7 val b = object: X()
+Unclassified usage (2: 16) open class X: A
+Unclassified usage (4: 13) val a = object: A
+Unclassified usage (7: 17) val b = object: X()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
index c03dd15..d425b40 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 1 public open class X: 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 (5: 19) public open class Y: X()
+Unclassified usage (7: 14) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
index c28c7ab..f2abff9 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 public open class X: 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 (7: 27) public open class Y: X()
+Unclassified usage (9: 22) public class Z: Y(), T
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
index 412be8a..328c9ac 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 public open class T: A
-Unclassified usage 4 public object O1: A()
-Unclassified usage 7 public object O2: T()
+Unclassified usage (2: 23) public open class T: A
+Unclassified usage (4: 19) public object O1: A()
+Unclassified usage (7: 23) public object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
index 2c025ef..d6115fb 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 open class X: A
-Unclassified usage 7 public open class Y: X()
-Unclassified usage 9 public class Z: T
+Unclassified usage (2: 16) open class X: A
+Unclassified usage (7: 27) public open class Y: X()
+Unclassified usage (9: 22) public class Z: T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
index 08168df..e59b0ef 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 2 open class T: A
-Unclassified usage 4 object O1: A
-Unclassified usage 7 object O2: T()
+Unclassified usage (2: 16) open class T: A
+Unclassified usage (4: 12) object O1: A
+Unclassified usage (7: 16) object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
index 00a9505..de9b8ca 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 4 interface T: A
-Unclassified usage 7 public interface Y: X
+Unclassified usage (4: 15) interface T: A
+Unclassified usage (7: 26) public interface Y: X
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
index 86dcdff..9417b49 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 1 public open class T: A
-Unclassified usage 3 public object O1: A()
-Unclassified usage 5 public object O2: T()
+Unclassified usage (1: 19) public open class T: A
+Unclassified usage (3: 15) public object O1: A()
+Unclassified usage (5: 15) public object O2: T()
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
index 9a5372f..93d78b5 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.results.txt
@@ -1,18 +1,18 @@
-Class/object property type 2 var next: Outer.A? = Outer.A()
-Function return types 15 fun getNext(): Outer.A? {
-Function return types 36 fun Any.toA(): Outer.A? {
-Local variable declaration 11 val aa: Outer.A = a
-Nested class/object 1 public class X(bar: String? = Outer.A.BAR): Outer.A() {
-Nested class/object 3 val myBar: String? = Outer.A.BAR
-Nested class/object 6 Outer.A.BAR = ""
-Nested class/object 7 Outer.A.foos()
-New instance creation 2 var next: Outer.A? = Outer.A()
-New instance creation 32 fun X.bar(a: Outer.A = Outer.A()) {
-Parameter type 10 fun foo(a: Outer.A) {
-Parameter type 32 fun X.bar(a: Outer.A = Outer.A()) {
-Super type qualifier 20 super<Outer.A>.foo()
-Supertype 1 public class X(bar: String? = Outer.A.BAR): Outer.A() {
-Supertype 23 companion object: Outer.A() {
-Supertype 28 object O: Outer.A() {
-Target type of 'is' operation 37 return if (this is Outer.A) this as Outer.A else null
-Usage in cast target type 37 return if (this is Outer.A) this as Outer.A else null
+Class/object property type (2: 21) var next: Outer.A? = Outer.A()
+Function return types (15: 26) fun getNext(): Outer.A? {
+Function return types (36: 22) fun Any.toA(): Outer.A? {
+Local variable declaration (11: 23) val aa: Outer.A = a
+Nested class/object (1: 37) public class X(bar: String? = Outer.A.BAR): Outer.A() {
+Nested class/object (3: 32) val myBar: String? = Outer.A.BAR
+Nested class/object (6: 15) Outer.A.BAR = ""
+Nested class/object (7: 15) Outer.A.foos()
+New instance creation (2: 32) var next: Outer.A? = Outer.A()
+New instance creation (32: 30) fun X.bar(a: Outer.A = Outer.A()) {
+Parameter type (10: 22) fun foo(a: Outer.A) {
+Parameter type (32: 20) fun X.bar(a: Outer.A = Outer.A()) {
+Super type qualifier (20: 21) super<Outer.A>.foo()
+Supertype (1: 51) public class X(bar: String? = Outer.A.BAR): Outer.A() {
+Supertype (23: 29) companion object: Outer.A() {
+Supertype (28: 17) object O: Outer.A() {
+Target type of 'is' operation (37: 30) return if (this is Outer.A) this as Outer.A else null
+Usage in cast target type (37: 47) return if (this is Outer.A) this as Outer.A else null
diff --git a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
index 9d4ebe4..561ae25 100644
--- a/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.results.txt
@@ -1,2 +1,2 @@
-Value read 4 println(a.foo)
-Value write 3 a.foo = "bar"
+Value read (4: 15) println(a.foo)
+Value write (3: 7) a.foo = "bar"
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
index e178f75..0e4831a 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.results.txt
@@ -1,4 +1,4 @@
-[JKMethodOverrides.0.java] Unclassified usage 11 public void foo() {
-[JKMethodOverrides.1.kt] Unclassified usage 14 public override fun foo() {
-[JKMethodOverrides.1.kt] Unclassified usage 2 public override fun foo() {
-[JKMethodOverrides.1.kt] Unclassified usage 8 public override fun foo() {
+[JKMethodOverrides.0.java] Unclassified usage (11: 17) public void foo() {
+[JKMethodOverrides.1.kt] Unclassified usage (14: 25) public override fun foo() {
+[JKMethodOverrides.1.kt] Unclassified usage (2: 25) public override fun foo() {
+[JKMethodOverrides.1.kt] Unclassified usage (8: 25) public override fun foo() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
index 0f57204..92a82ad 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.results.txt
@@ -1,4 +1,4 @@
-Callable reference 5 val a = A::foo
-Callable reference 6 val b = B::foo
-Function call 2 A().foo()
-Function call 3 B().foo()
+Callable reference (5: 16) val a = A::foo
+Callable reference (6: 16) val b = B::foo
+Function call (2: 9) A().foo()
+Function call (3: 9) B().foo()
diff --git a/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt b/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
index 0288f98..759e445 100644
--- a/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
+++ b/idea/testData/findUsages/java/findJavaMethodUsages/SyntheticProperties.results.txt
@@ -1,2 +1,2 @@
-Value read 2 print(javaClass.something)
-Value write 4 javaClass.something++
+Value read (2: 21) print(javaClass.something)
+Value write (4: 15) javaClass.something++
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
index 036097d..83057d8 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertyGetterUsagesKJ.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyGetterUsagesKJ.0.java] Unclassified usage 23 new J().getP();
-[javaPropertyGetterUsagesKJ.0.java] Unclassified usage 26 new B().getP();
-[javaPropertyGetterUsagesKJ.1.kt] Value read 20 val t = J().p
-[javaPropertyGetterUsagesKJ.1.kt] Value read 23 val t = B().p
+[javaPropertyGetterUsagesKJ.0.java] Unclassified usage (23: 17) new J().getP();
+[javaPropertyGetterUsagesKJ.0.java] Unclassified usage (26: 17) new B().getP();
+[javaPropertyGetterUsagesKJ.1.kt] Value read (20: 17) val t = J().p
+[javaPropertyGetterUsagesKJ.1.kt] Value read (23: 17) val t = B().p
\ No newline at end of file
diff --git a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
index 8771af0..7452d91 100644
--- a/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
+++ b/idea/testData/findUsages/java/findJavaPropertyUsages/javaPropertySetterUsagesKJ.results.txt
@@ -1,4 +1,4 @@
-[javaPropertySetterUsagesKJ.0.java] Unclassified usage 24 new J().setP(1);
-[javaPropertySetterUsagesKJ.0.java] Unclassified usage 27 new B().setP(1);
-[javaPropertySetterUsagesKJ.1.kt] Value write 21 J().p = 1
-[javaPropertySetterUsagesKJ.1.kt] Value write 24 B().p = 1
+[javaPropertySetterUsagesKJ.0.java] Unclassified usage (24: 17) new J().setP(1);
+[javaPropertySetterUsagesKJ.0.java] Unclassified usage (27: 17) new B().setP(1);
+[javaPropertySetterUsagesKJ.1.kt] Value write (21: 9) J().p = 1
+[javaPropertySetterUsagesKJ.1.kt] Value write (24: 9) B().p = 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
index 5777950..c87b2dc 100644
--- a/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
@@ -1,4 +1,4 @@
-Function call 10 ext() // companion object is extension receiver
-Function call 5 foo()
-Implicit 'get' 8 1[2] // using companion object function by convention
-Value read 6 v
+Function call (10: 9) ext() // companion object is extension receiver
+Function call (5: 9) foo()
+Implicit 'get' (8: 9) 1[2] // using companion object function by convention
+Value read (6: 9) v
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt b/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
index 254b86f..79dabc1 100644
--- a/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 5 System.out.println(Foo.CONST);
-Unclassified usage 6 Foo.s();
-Unclassified usage 7 Foo.Companion.f();
+Unclassified usage (5: 32) System.out.println(Foo.CONST);
+Unclassified usage (6: 13) Foo.s();
+Unclassified usage (7: 13) Foo.Companion.f();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/companionObject/named.results.txt b/idea/testData/findUsages/kotlin/companionObject/named.results.txt
index 5ca3f3e..67183b6 100644
--- a/idea/testData/findUsages/kotlin/companionObject/named.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/named.results.txt
@@ -1,4 +1,4 @@
-Companion object 5 Foo.f()
-Companion object 6 val x = Foo
-Companion object 8 Foo.Bar.f()
-Companion object 9 val xx = Foo.Bar
+Companion object (5: 5) Foo.f()
+Companion object (6: 13) val x = Foo
+Companion object (8: 9) Foo.Bar.f()
+Companion object (9: 18) val xx = Foo.Bar
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/companionObject/simple.results.txt b/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
index 33fae9a..86cefd3 100644
--- a/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
+++ b/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
@@ -1,4 +1,4 @@
-Companion object 5 Foo.f()
-Companion object 6 val x = Foo
-Companion object 8 Foo.Companion.f()
-Companion object 9 val xx = Foo.Companion
+Companion object (5: 5) Foo.f()
+Companion object (6: 13) val x = Foo
+Companion object (8: 9) Foo.Companion.f()
+Companion object (9: 18) val xx = Foo.Companion
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt b/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
index 56bc298..ac01025 100644
--- a/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/compareTo.results.txt
@@ -1,5 +1,5 @@
-Function call 10 A(0) compareTo A(1)
-Function call 11 A(0) < A(1)
-Function call 12 A(0) <= A(1)
-Function call 13 A(0) > A(1)
-Function call 14 A(0) >= A(1)
+Function call (10: 10) A(0) compareTo A(1)
+Function call (11: 10) A(0) < A(1)
+Function call (12: 10) A(0) <= A(1)
+Function call (13: 10) A(0) > A(1)
+Function call (14: 10) A(0) >= A(1)
diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt b/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
index 166e20e..2177898 100644
--- a/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/componentFunctions.results.txt
@@ -1,4 +1,4 @@
-[componentFunctions.0.kt] Function call 9 a.component1()
-[componentFunctions.0.kt] Value read 10 val (x, y, z) = a
-[componentFunctions.0.kt] Value read 8 a.n
-[componentFunctions.1.kt] Value read 2 for ((x, y, z) in arrayOf<A>()) {
+[componentFunctions.0.kt] Function call (9: 7) a.component1()
+[componentFunctions.0.kt] Value read (10: 9) val (x, y, z) = a
+[componentFunctions.0.kt] Value read (8: 7) a.n
+[componentFunctions.1.kt] Value read (2: 10) for ((x, y, z) in arrayOf<A>()) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
index ea35cc5..0978371 100644
--- a/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.results.txt
@@ -1,3 +1,3 @@
-Function call 10 a.component1()
-Value read 11 val (x, y, z) = a
-Value read 9 a.n
+Function call (10: 7) a.component1()
+Value read (11: 9) val (x, y, z) = a
+Value read (9: 7) a.n
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/contains.results.txt b/idea/testData/findUsages/kotlin/conventions/contains.results.txt
index b542b0e..db3fe43 100644
--- a/idea/testData/findUsages/kotlin/conventions/contains.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/contains.results.txt
@@ -1,5 +1,5 @@
-Function call 10 1 in A(2)
-Function call 11 1 !in A(2)
-Function call 13 in A(2) -> {}
-Function call 14 !in A(2) -> {}
-Function call 9 A(2) contains 1
+Function call (10: 7) 1 in A(2)
+Function call (11: 7) 1 !in A(2)
+Function call (13: 9) in A(2) -> {}
+Function call (14: 9) !in A(2) -> {}
+Function call (9: 10) A(2) contains 1
diff --git a/idea/testData/findUsages/kotlin/conventions/equals.results.txt b/idea/testData/findUsages/kotlin/conventions/equals.results.txt
index 0ddf42e..96c0ce3 100644
--- a/idea/testData/findUsages/kotlin/conventions/equals.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/equals.results.txt
@@ -1,4 +1,4 @@
-Function call 10 A(0) == A(1)
-Function call 11 A(0) != A(1)
-Function call 12 A(0) equals A(1)
-Function call 6 override fun equals(other: Any?): Boolean = other is A && other.n == n
+Function call (10: 10) A(0) == A(1)
+Function call (11: 10) A(0) != A(1)
+Function call (12: 10) A(0) equals A(1)
+Function call (6: 71) override fun equals(other: Any?): Boolean = other is A && other.n == n
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt b/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
index 5ae6e4c..c4d3ec3 100644
--- a/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/forIteration.results.txt
@@ -1,2 +1,2 @@
-Implicit iteration 13 for (a in A<String>()) {}
-Implicit iteration 15 for (a in A<Int>()) {}
+Implicit iteration (13: 12) for (a in A<String>()) {}
+Implicit iteration (15: 12) for (a in A<Int>()) {}
diff --git a/idea/testData/findUsages/kotlin/conventions/get.results.txt b/idea/testData/findUsages/kotlin/conventions/get.results.txt
index f7ef554..8304ef1 100644
--- a/idea/testData/findUsages/kotlin/conventions/get.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/get.results.txt
@@ -1,2 +1,2 @@
-Function call 9 B(1).get(2)
-Implicit 'get' 10 B(1)[2]
+Function call (9: 10) B(1).get(2)
+Implicit 'get' (10: 5) B(1)[2]
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt b/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
index ec196af..1abd0f4 100644
--- a/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/getAsPropertyDelegate.results.txt
@@ -1 +1 @@
-Property delegation 10 val p: String by Delegate()
+Property delegation (10: 15) val p: String by Delegate()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/inc.results.txt b/idea/testData/findUsages/kotlin/conventions/inc.results.txt
index 294ca93..34be7f4 100644
--- a/idea/testData/findUsages/kotlin/conventions/inc.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/inc.results.txt
@@ -1,3 +1,3 @@
-Function call 10 a.inc()
-Function call 11 ++a
-Function call 12 a++
+Function call (10: 7) a.inc()
+Function call (11: 5) ++a
+Function call (12: 6) a++
diff --git a/idea/testData/findUsages/kotlin/conventions/invoke.results.txt b/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
index cae68d3..379e82d 100644
--- a/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/invoke.results.txt
@@ -1 +1 @@
-Function call 9 B(1).invoke(2)
+Function call (9: 10) B(1).invoke(2)
diff --git a/idea/testData/findUsages/kotlin/conventions/plus.results.txt b/idea/testData/findUsages/kotlin/conventions/plus.results.txt
index 0dd61ab..aae3a5f 100644
--- a/idea/testData/findUsages/kotlin/conventions/plus.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/plus.results.txt
@@ -1,6 +1,6 @@
-Function call 10 A(0) + A(1) + 2
-Function call 11 A(0) plus A(1) plus 2
-Function call 12 A(0).plus(A(1).plus(2))
-Function call 15 a += 1
-Function call 6 fun plus(a: A): A = this + a.n
-Unclassified usage 18 +A(0)
+Function call (10: 17) A(0) + A(1) + 2
+Function call (11: 20) A(0) plus A(1) plus 2
+Function call (12: 20) A(0).plus(A(1).plus(2))
+Function call (15: 7) a += 1
+Function call (6: 30) fun plus(a: A): A = this + a.n
+Unclassified usage (18: 5) +A(0)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
index 97482ce..1a11952 100644
--- a/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/plusAssign.results.txt
@@ -1,3 +1,3 @@
-Function call 10 this += a.n
-Function call 16 a.plusAssign(1)
-Function call 17 a += 1
+Function call (10: 14) this += a.n
+Function call (16: 7) a.plusAssign(1)
+Function call (17: 7) a += 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt b/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
index 95ef811..51dd8b6 100644
--- a/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/propertyDelegatedFunction.results.txt
@@ -1 +1 @@
-Property delegation 15 var p: String by Delegate()
+Property delegation (15: 15) var p: String by Delegate()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/set.results.txt b/idea/testData/findUsages/kotlin/conventions/set.results.txt
index 0b6310b..8b4ed0b 100644
--- a/idea/testData/findUsages/kotlin/conventions/set.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/set.results.txt
@@ -1,2 +1,2 @@
-Function call 10 a.set(2, B(2))
-Implicit 'set' 11 a[2] = B(2)
+Function call (10: 7) a.set(2, B(2))
+Implicit 'set' (11: 5) a[2] = B(2)
diff --git a/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt b/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
index fed791d..1b87cdc 100644
--- a/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/setAsPropertyDelegate.results.txt
@@ -1 +1 @@
-Property delegation 13 var p: String by Delegate()
+Property delegation (13: 15) var p: String by Delegate()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
index 3237b10..706b8ce 100644
--- a/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
+++ b/idea/testData/findUsages/kotlin/conventions/unaryMinus.results.txt
@@ -1,2 +1,2 @@
-Function call 10 -A(1)
-Function call 9 A(1).unaryMinus()
+Function call (10: 5) -A(1)
+Function call (9: 10) A(1).unaryMinus()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
index f5652e8..44a4222 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInPlainText.results.txt
@@ -1 +1 @@
-Unclassified usage 1 test.Foo
\ No newline at end of file
+Unclassified usage (1: 1) test.Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
index b5081ce..5d5a3ce 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
@@ -1 +1 @@
-Unclassified usage 1 <foo bar="server.Server"></foo>
+Unclassified usage (1: 18) <foo bar="server.Server"></foo>
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
index 3369e6b..aa27029 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.results.txt
@@ -1,4 +1,4 @@
-Field declaration 4 private Server myServer = new Server();
-Method parameter declaration 6 public void setServer(Server server) {
-Method return type 10 public Server getMyServer() {
-New instance creation 4 private Server myServer = new Server();
+Field declaration (4: 13) private Server myServer = new Server();
+Method parameter declaration (6: 27) public void setServer(Server server) {
+Method return type (10: 12) public Server getMyServer() {
+New instance creation (4: 35) private Server myServer = new Server();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
index 402fe7a..61fd77b 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.results.txt
@@ -1 +1 @@
-New instance creation 4 private Server myServer = new Server();
+New instance creation (4: 35) private Server myServer = new Server();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
index 73d216d..76428ba 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.results.txt
@@ -1 +1 @@
-Unclassified usage 9 x.foo("");
+Unclassified usage (9: 11) x.foo("");
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
index e24fe88..d0043a6 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.results.txt
@@ -1 +1 @@
-Unclassified usage 3 a.foo("");
+Unclassified usage (3: 11) a.foo("");
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
index 39d3014..b9ae0e6 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.results.txt
@@ -1,3 +1,3 @@
-Field declaration 4 private Server myServer = new Server();
-Method parameter declaration 6 public void setServer(Server server) {
-Method return type 10 public Server getMyServer() {
+Field declaration (4: 13) private Server myServer = new Server();
+Method parameter declaration (6: 27) public void setServer(Server server) {
+Method return type (10: 12) public Server getMyServer() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
index ac6bbfc..1b7db73 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 10 System.out.println(x.getA() + " " + x.getB());
-Unclassified usage 10 System.out.println(x.getA() + " " + x.getB());
-Unclassified usage 11 x.setB(12);
+Unclassified usage (10: 30) System.out.println(x.getA() + " " + x.getB());
+Unclassified usage (10: 47) System.out.println(x.getA() + " " + x.getB());
+Unclassified usage (11: 11) x.setB(12);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
index 1304a79..728ebac 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 4 System.out.println(a.getA() + " " + a.getB());
-Unclassified usage 4 System.out.println(a.getA() + " " + a.getB());
-Unclassified usage 5 a.setB(12);
+Unclassified usage (4: 30) System.out.println(a.getA() + " " + a.getB());
+Unclassified usage (4: 47) System.out.println(a.getA() + " " + a.getB());
+Unclassified usage (5: 11) a.setB(12);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
index 267dd97..44d5395 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaClassSecondaryCtrUsages.results.txt
@@ -1 +1 @@
-New instance creation 3 new A()
+New instance creation (3: 13) new A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
index 05f6c7e..7968096 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.results.txt
@@ -1 +1 @@
-Unclassified usage 1 class B extends A {
+Unclassified usage (1: 7) class B extends A {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
index d3b1e8b..4b57f10 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.results.txt
@@ -1,3 +1,3 @@
-[javaDerivedClassUsages2.0.kt] Unclassified usage 11 open class C: Y {
-[javaDerivedClassUsages2.0.kt] Unclassified usage 7 open class A: X {
-[javaDerivedClassUsages2.1.java] Unclassified usage 1 class B extends A {
+[javaDerivedClassUsages2.0.kt] Unclassified usage (11: 12) open class C: Y {
+[javaDerivedClassUsages2.0.kt] Unclassified usage (7: 12) open class A: X {
+[javaDerivedClassUsages2.1.java] Unclassified usage (1: 7) class B extends A {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
index b914320..a4392d1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.results.txt
@@ -1,2 +1,2 @@
-[javaDerivedInterfaceUsages1.0.kt] Unclassified usage 15 interface Z: A {
-[javaDerivedInterfaceUsages1.1.java] Unclassified usage 9 interface U extends Z {
+[javaDerivedInterfaceUsages1.0.kt] Unclassified usage (15: 11) interface Z: A {
+[javaDerivedInterfaceUsages1.1.java] Unclassified usage (9: 11) interface U extends Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
index db65a35..c9bbb41 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.results.txt
@@ -1,3 +1,3 @@
-[javaDerivedInterfaceUsages2.0.kt] Unclassified usage 15 interface Z: A {
-[javaDerivedInterfaceUsages2.1.java] Unclassified usage 5 interface Y extends X {
-[javaDerivedInterfaceUsages2.1.java] Unclassified usage 9 interface U extends Z {
+[javaDerivedInterfaceUsages2.0.kt] Unclassified usage (15: 11) interface Z: A {
+[javaDerivedInterfaceUsages2.1.java] Unclassified usage (5: 11) interface Y extends X {
+[javaDerivedInterfaceUsages2.1.java] Unclassified usage (9: 11) interface U extends Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
index 2d1efba..d125414 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.results.txt
@@ -1,22 +1,22 @@
-Class/object property type 6 var nextServer: Server? = new Server()
-Companion object 38 fun Client.bar(s: Server = Server.NAME) {
-Companion object 5 class Client(name: String = Server.NAME): Server() {
-Companion object 7 val name = Server.NAME
-Function return types 14 fun getNextServer(): Server? {
-Function return types 46 fun Any.asServer(): Server? {
-Local variable declaration 10 val server: Server = s
-Parameter type 38 fun Client.bar(s: Server = Server.NAME) {
-Parameter type 9 fun foo(s: Server) {
-Super type qualifier 19 super<Server>.work()
-Supertype 23 companion object: Server() {
-Supertype 28 object ClientObject: Server() {
-Supertype 5 class Client(name: String = Server.NAME): Server() {
-Target type of 'is' operation 48 is Server -> println("Server!")
-Target type of 'is' operation 50 return if (this is Server) this as Server else this as? Server
-Type parameter 32 class Servers: Iterator<Server> {
-Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Type parameter 36 fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
-Usage in cast target type 50 return if (this is Server) this as Server else this as? Server
-Usage in cast target type 50 return if (this is Server) this as Server else this as? Server
-Usage in import 3 import server.Server
+Class/object property type (6: 21) var nextServer: Server? = new Server()
+Companion object (38: 28) fun Client.bar(s: Server = Server.NAME) {
+Companion object (5: 29) class Client(name: String = Server.NAME): Server() {
+Companion object (7: 16) val name = Server.NAME
+Function return types (14: 26) fun getNextServer(): Server? {
+Function return types (46: 21) fun Any.asServer(): Server? {
+Local variable declaration (10: 21) val server: Server = s
+Parameter type (38: 19) fun Client.bar(s: Server = Server.NAME) {
+Parameter type (9: 16) fun foo(s: Server) {
+Super type qualifier (19: 15) super<Server>.work()
+Supertype (23: 23) companion object: Server() {
+Supertype (28: 22) object ClientObject: Server() {
+Supertype (5: 43) class Client(name: String = Server.NAME): Server() {
+Target type of 'is' operation (48: 12) is Server -> println("Server!")
+Target type of 'is' operation (50: 24) return if (this is Server) this as Server else this as? Server
+Type parameter (32: 25) class Servers: Iterator<Server> {
+Type parameter (36: 14) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Type parameter (36: 36) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Type parameter (36: 55) fun Iterator<Server>.f(p: Iterator<Server>): Iterator<Server> = this
+Usage in cast target type (50: 40) return if (this is Server) this as Server else this as? Server
+Usage in cast target type (50: 61) return if (this is Server) this as Server else this as? Server
+Usage in import (3: 15) import server.Server
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
index 8eff2fb..64eca9b 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.results.txt
@@ -1,2 +1,2 @@
-Annotation 5 @X("")
-Usage in import 3 import server.X
+Annotation (5: 2) @X("")
+Usage in import (3: 15) import server.X
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
index c031d2a..0cbb2ef 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.results.txt
@@ -1,4 +1,4 @@
-Type constraint 5 class Client<T: Data, X> where X: Data {
-Type constraint 5 class Client<T: Data, X> where X: Data {
-Type parameter 9 val c = Client<Data/*, [ERROR]*/>()
-Usage in import 3 import server.Data
+Type constraint (5: 17) class Client<T: Data, X> where X: Data {
+Type constraint (5: 35) class Client<T: Data, X> where X: Data {
+Type parameter (9: 16) val c = Client<Data/*, [ERROR]*/>()
+Usage in import (3: 15) import server.Data
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
index c3d9a64..bbb8d55 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.results.txt
@@ -1,2 +1,2 @@
-Super type qualifier 7 super<Server>.work()
-Supertype 5 class Client(): Server() {
+Super type qualifier (7: 15) super<Server>.work()
+Supertype (5: 17) class Client(): Server() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
index 1c52a09..e9785fa 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.results.txt
@@ -1,5 +1,5 @@
-[kotlinClassConstructorUsages.0.kt] Unclassified usage 6 constructor(name: String): this() {
-[kotlinClassConstructorUsages.1.kt] Supertype 24 object ClientObject: Server() {
-[kotlinClassConstructorUsages.1.kt] Supertype 5 class Client: Server() {
-[kotlinClassConstructorUsages.1.kt] Unclassified usage 29 constructor(name: String) {
-[kotlinClassConstructorUsages.1.kt] Unclassified usage 33 constructor(): super() {
+[kotlinClassConstructorUsages.0.kt] Unclassified usage (6: 32) constructor(name: String): this() {
+[kotlinClassConstructorUsages.1.kt] Supertype (24: 22) object ClientObject: Server() {
+[kotlinClassConstructorUsages.1.kt] Supertype (5: 15) class Client: Server() {
+[kotlinClassConstructorUsages.1.kt] Unclassified usage (29: 30) constructor(name: String) {
+[kotlinClassConstructorUsages.1.kt] Unclassified usage (33: 20) constructor(): super() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
index 2471741..0dd0902 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 13 doSomething(object : A() {}, object: Z {})
-Unclassified usage 13 doSomething(object : A() {}, object: Z {})
-Unclassified usage 16 val x = object: Z {
+Unclassified usage (13: 17) doSomething(object : A() {}, object: Z {})
+Unclassified usage (13: 34) doSomething(object : A() {}, object: Z {})
+Unclassified usage (16: 17) val x = object: Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
index eaff47d..244b907 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
@@ -1 +1 @@
-Unclassified usage 3 open class B: A() {
+Unclassified usage (3: 12) open class B: A() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
index 9375b4c..f929716 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 17 class U: Z {
-Unclassified usage 4 open class B: A() {
+Unclassified usage (17: 15) class U: Z {
+Unclassified usage (4: 16) open class B: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
index ffdd0f0..f13a5b4 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 11 object O2: Z
-Unclassified usage 8 object O1: A()
+Unclassified usage (11: 16) object O2: Z
+Unclassified usage (8: 12) object O1: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
index bfece32..7defdbe 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.results.txt
@@ -1 +1 @@
-Unclassified usage 5 open class B: A() {
+Unclassified usage (5: 16) open class B: A() {
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
index e4c7629..dc3a571 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 12 object O2: Z
-Unclassified usage 9 object O1: A()
+Unclassified usage (12: 16) object O2: Z
+Unclassified usage (9: 12) object O1: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
index c4eb313..880c252 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 14 interface Z: A {
-Unclassified usage 18 interface U: Z {
+Unclassified usage (14: 19) interface Z: A {
+Unclassified usage (18: 19) interface U: Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
index f0e6aa3..3f6b2ac60 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 7 object O1: A()
-Unclassified usage 9 object O2: Z
+Unclassified usage (7: 8) object O1: A()
+Unclassified usage (9: 8) object O2: Z
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
index 6acb0bd..d580ff9 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 11 interface Z: A {
-Unclassified usage 15 interface U: Z {
+Unclassified usage (11: 11) interface Z: A {
+Unclassified usage (15: 11) interface U: Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
index 2ab7071..ccfa47f 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.results.txt
@@ -1 +1 @@
-Function call 9 x.foo("")
+Function call (9: 11) x.foo("")
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
index 859b7d2..44d92d0 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.results.txt
@@ -1 +1 @@
-Function call 3 a.foo("")
+Function call (3: 11) a.foo("")
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
index 8bec4cc..68c1334 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.results.txt
@@ -1,13 +1,13 @@
-Class/object property type 6 var nextServer: Server? = new Server()
-Companion object 28 fun Client.bar(s: Server = Server.NAME) {
-Companion object 5 class Client(name: String = Server.NAME): Server() {
-Companion object 7 val name = Server.NAME
-Function return types 14 fun getNextServer(): Server? {
-Function return types 36 fun Any.asServer(): Server? {
-Local variable declaration 10 val server: Server = s
-Parameter type 28 fun Client.bar(s: Server = Server.NAME) {
-Parameter type 9 fun foo(s: Server) {
-Super type qualifier 19 super<Server>.work()
-Target type of 'is' operation 37 return if (this is Server) this as Server else null
-Usage in cast target type 37 return if (this is Server) this as Server else null
-Usage in import 3 import server.Server
+Class/object property type (6: 21) var nextServer: Server? = new Server()
+Companion object (28: 28) fun Client.bar(s: Server = Server.NAME) {
+Companion object (5: 29) class Client(name: String = Server.NAME): Server() {
+Companion object (7: 16) val name = Server.NAME
+Function return types (14: 26) fun getNextServer(): Server? {
+Function return types (36: 21) fun Any.asServer(): Server? {
+Local variable declaration (10: 21) val server: Server = s
+Parameter type (28: 19) fun Client.bar(s: Server = Server.NAME) {
+Parameter type (9: 16) fun foo(s: Server) {
+Super type qualifier (19: 15) super<Server>.work()
+Target type of 'is' operation (37: 24) return if (this is Server) this as Server else null
+Usage in cast target type (37: 40) return if (this is Server) this as Server else null
+Usage in import (3: 15) import server.Server
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
index 060587b..acf261b 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.results.txt
@@ -1,3 +1,3 @@
-Value read 10 println("${x.a} ${x.b}")
-Value read 10 println("${x.a} ${x.b}")
-Value write 11 x.b = 12
+Value read (10: 22) println("${x.a} ${x.b}")
+Value read (10: 29) println("${x.a} ${x.b}")
+Value write (11: 11) x.b = 12
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
index 433dcd3..0dc835e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.results.txt
@@ -1,6 +1,6 @@
-Value read 4 println("${a.a} ${a.b}")
-Value read 4 println("${a.a} ${a.b}")
-Value read 5 println("${a.t} ${a.u}")
-Value read 5 println("${a.t} ${a.u}")
-Value write 6 a.b = 12
-Value write 7 a.u = 13
+Value read (4: 22) println("${a.a} ${a.b}")
+Value read (4: 29) println("${a.a} ${a.b}")
+Value read (5: 22) println("${a.t} ${a.u}")
+Value read (5: 29) println("${a.t} ${a.u}")
+Value write (6: 11) a.b = 12
+Value write (7: 11) a.u = 13
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
index 0e4d7f9..b05ebb8 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassSecondaryCtorUsages.results.txt
@@ -1 +1 @@
-New instance creation 2 A()
+New instance creation (2: 5) A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
index 193330f..379dc22 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinDeeplyNestedClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinDeeplyNestedClassAllUsages.1.kt] Class/object property type 6 var next: Inner.A? = Inner.A()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 10 Inner.A.bar = ""
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 11 Inner.A.foo()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 5 public class X(bar: String? = Inner.A.bar): Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object 7 val myBar: String? = Inner.A.bar
-[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types 19 fun getNext(): Inner.A? {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types 40 fun Any.toA(): Inner.A? {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Local variable declaration 15 val aa: Inner.A = a
-[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation 36 fun X.bar(a: Inner.A = Inner.A()) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation 6 var next: Inner.A? = Inner.A()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type 14 fun foo(a: Inner.A) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type 36 fun X.bar(a: Inner.A = Inner.A()) {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Super type qualifier 24 super<Inner.A>.foo()
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 27 companion object: Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 32 object O: Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype 5 public class X(bar: String? = Inner.A.bar): Inner.A() {
-[kotlinDeeplyNestedClassAllUsages.1.kt] Target type of 'is' operation 41 return if (this is Inner.A) this as Inner.A else null
-[kotlinDeeplyNestedClassAllUsages.1.kt] Usage in cast target type 41 return if (this is Inner.A) this as Inner.A else null
-[kotlinDeeplyNestedClassAllUsages.2.java] Field declaration 6 Inner.A next = new Inner.A();
-[kotlinDeeplyNestedClassAllUsages.2.java] New instance creation 6 Inner.A next = new Inner.A();
-[kotlinDeeplyNestedClassAllUsages.2.java] Usage in extends/implements clause 5 public class X extends Inner.A {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Class/object property type (6: 21) var next: Inner.A? = Inner.A()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (10: 15) Inner.A.bar = ""
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (11: 15) Inner.A.foo()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (5: 37) public class X(bar: String? = Inner.A.bar): Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Companion object (7: 32) val myBar: String? = Inner.A.bar
+[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types (19: 26) fun getNext(): Inner.A? {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Function return types (40: 22) fun Any.toA(): Inner.A? {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Local variable declaration (15: 23) val aa: Inner.A = a
+[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation (36: 30) fun X.bar(a: Inner.A = Inner.A()) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] New instance creation (6: 32) var next: Inner.A? = Inner.A()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type (14: 22) fun foo(a: Inner.A) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Parameter type (36: 20) fun X.bar(a: Inner.A = Inner.A()) {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Super type qualifier (24: 21) super<Inner.A>.foo()
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (27: 29) companion object: Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (32: 17) object O: Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Supertype (5: 51) public class X(bar: String? = Inner.A.bar): Inner.A() {
+[kotlinDeeplyNestedClassAllUsages.1.kt] Target type of 'is' operation (41: 30) return if (this is Inner.A) this as Inner.A else null
+[kotlinDeeplyNestedClassAllUsages.1.kt] Usage in cast target type (41: 47) return if (this is Inner.A) this as Inner.A else null
+[kotlinDeeplyNestedClassAllUsages.2.java] Field declaration (6: 11) Inner.A next = new Inner.A();
+[kotlinDeeplyNestedClassAllUsages.2.java] New instance creation (6: 30) Inner.A next = new Inner.A();
+[kotlinDeeplyNestedClassAllUsages.2.java] Usage in extends/implements clause (5: 30) public class X extends Inner.A {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
index c338c88..1a17b96 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinInnerClassAllUsages.1.kt] Class/object property type 7 var next: Outer.A? = (this@KOuter as Outer).A()
-[kotlinInnerClassAllUsages.1.kt] Function return types 19 fun getNext(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Function return types 33 fun Any.toA(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Function return types 37 fun Any.asServer(): Outer.A? {
-[kotlinInnerClassAllUsages.1.kt] Local variable declaration 15 val aa: Outer.A = a
-[kotlinInnerClassAllUsages.1.kt] New instance creation 11 (this@KOuter as Outer).A().bar = ""
-[kotlinInnerClassAllUsages.1.kt] New instance creation 29 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-[kotlinInnerClassAllUsages.1.kt] New instance creation 6 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-[kotlinInnerClassAllUsages.1.kt] New instance creation 7 var next: Outer.A? = (this@KOuter as Outer).A()
-[kotlinInnerClassAllUsages.1.kt] New instance creation 8 val myBar: String? = (this@KOuter as Outer).A().bar
-[kotlinInnerClassAllUsages.1.kt] Parameter type 14 fun foo(a: Outer.A) {
-[kotlinInnerClassAllUsages.1.kt] Parameter type 29 fun KOuter.X.bar(a: Outer.A = Outer().A()) {
-[kotlinInnerClassAllUsages.1.kt] Super type qualifier 24 super<Outer.A>.foo()
-[kotlinInnerClassAllUsages.1.kt] Supertype 6 public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
-[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation 34 return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation 38 return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Usage in cast target type 34 return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.1.kt] Usage in cast target type 38 return if (this is Outer.A) this as Outer.A else null
-[kotlinInnerClassAllUsages.2.java] Field declaration 10 A next = new A();
-[kotlinInnerClassAllUsages.2.java] New instance creation 10 A next = new A();
-[kotlinInnerClassAllUsages.2.java] Usage in extends/implements clause 6 class Y extends A {
+[kotlinInnerClassAllUsages.1.kt] Class/object property type (7: 25) var next: Outer.A? = (this@KOuter as Outer).A()
+[kotlinInnerClassAllUsages.1.kt] Function return types (19: 30) fun getNext(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Function return types (33: 22) fun Any.toA(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Function return types (37: 27) fun Any.asServer(): Outer.A? {
+[kotlinInnerClassAllUsages.1.kt] Local variable declaration (15: 27) val aa: Outer.A = a
+[kotlinInnerClassAllUsages.1.kt] New instance creation (11: 36) (this@KOuter as Outer).A().bar = ""
+[kotlinInnerClassAllUsages.1.kt] New instance creation (29: 39) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+[kotlinInnerClassAllUsages.1.kt] New instance creation (6: 64) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+[kotlinInnerClassAllUsages.1.kt] New instance creation (7: 53) var next: Outer.A? = (this@KOuter as Outer).A()
+[kotlinInnerClassAllUsages.1.kt] New instance creation (8: 53) val myBar: String? = (this@KOuter as Outer).A().bar
+[kotlinInnerClassAllUsages.1.kt] Parameter type (14: 26) fun foo(a: Outer.A) {
+[kotlinInnerClassAllUsages.1.kt] Parameter type (29: 27) fun KOuter.X.bar(a: Outer.A = Outer().A()) {
+[kotlinInnerClassAllUsages.1.kt] Super type qualifier (24: 25) super<Outer.A>.foo()
+[kotlinInnerClassAllUsages.1.kt] Supertype (6: 80) public inner class X(bar: String? = (this@KOuter as Outer).A().bar): Outer.A() {
+[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation (34: 30) return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Target type of 'is' operation (38: 30) return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Usage in cast target type (34: 47) return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.1.kt] Usage in cast target type (38: 47) return if (this is Outer.A) this as Outer.A else null
+[kotlinInnerClassAllUsages.2.java] Field declaration (10: 5) A next = new A();
+[kotlinInnerClassAllUsages.2.java] New instance creation (10: 18) A next = new A();
+[kotlinInnerClassAllUsages.2.java] Usage in extends/implements clause (6: 21) class Y extends A {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
index b59f915..25345dc 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 11 val c = object: A() {}
-Unclassified usage 13 val d = object: T {}
-Unclassified usage 6 val b = object: A() {}
+Unclassified usage (11: 17) val c = object: A() {}
+Unclassified usage (13: 17) val d = object: T {}
+Unclassified usage (6: 13) val b = object: A() {}
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
index 0b1dc6b..375b8f1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 11 class C: A()
-Unclassified usage 13 class D: T
-Unclassified usage 6 class B: A()
+Unclassified usage (11: 15) class C: A()
+Unclassified usage (13: 15) class D: T
+Unclassified usage (6: 11) class B: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
index e4e3b09..be0585d 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-Unclassified usage 11 object C: A()
-Unclassified usage 13 object D: T
-Unclassified usage 6 object B: A()
+Unclassified usage (11: 16) object C: A()
+Unclassified usage (13: 16) object D: T
+Unclassified usage (6: 12) object B: A()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
index 909840a4..1937920 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 6 interface T: A
-Unclassified usage 9 interface U: T
+Unclassified usage (6: 15) interface T: A
+Unclassified usage (9: 19) interface U: T
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
index c9d2d90..9ce8c4db 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.results.txt
@@ -1 +1 @@
-New instance creation 6 return Bar()
+New instance creation (6: 12) return Bar()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
index 5286540..b5a77b8 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.results.txt
@@ -1 +1 @@
-New instance creation 7 return Bar()
+New instance creation (7: 16) return Bar()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
index 257513f..a63fd0c 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.results.txt
@@ -1,21 +1,21 @@
-[kotlinNestedClassAllUsages.1.kt] Class/object property type 6 var next: Outer.A? = Outer.A()
-[kotlinNestedClassAllUsages.1.kt] Companion object 10 Outer.A.bar = ""
-[kotlinNestedClassAllUsages.1.kt] Companion object 11 Outer.A.foo()
-[kotlinNestedClassAllUsages.1.kt] Companion object 5 public class X(bar: String? = Outer.A.bar): Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Companion object 7 val myBar: String? = Outer.A.bar
-[kotlinNestedClassAllUsages.1.kt] Function return types 19 fun getNext(): Outer.A? {
-[kotlinNestedClassAllUsages.1.kt] Function return types 40 fun Any.toA(): Outer.A? {
-[kotlinNestedClassAllUsages.1.kt] Local variable declaration 15 val aa: Outer.A = a
-[kotlinNestedClassAllUsages.1.kt] New instance creation 36 fun X.bar(a: Outer.A = Outer.A()) {
-[kotlinNestedClassAllUsages.1.kt] New instance creation 6 var next: Outer.A? = Outer.A()
-[kotlinNestedClassAllUsages.1.kt] Parameter type 14 fun foo(a: Outer.A) {
-[kotlinNestedClassAllUsages.1.kt] Parameter type 36 fun X.bar(a: Outer.A = Outer.A()) {
-[kotlinNestedClassAllUsages.1.kt] Super type qualifier 24 super<Outer.A>.foo()
-[kotlinNestedClassAllUsages.1.kt] Supertype 27 companion object: Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Supertype 32 object O: Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Supertype 5 public class X(bar: String? = Outer.A.bar): Outer.A() {
-[kotlinNestedClassAllUsages.1.kt] Target type of 'is' operation 41 return if (this is Outer.A) this as Outer.A else null
-[kotlinNestedClassAllUsages.1.kt] Usage in cast target type 41 return if (this is Outer.A) this as Outer.A else null
-[kotlinNestedClassAllUsages.2.java] Field declaration 6 Outer.A next = new Outer.A();
-[kotlinNestedClassAllUsages.2.java] New instance creation 6 Outer.A next = new Outer.A();
-[kotlinNestedClassAllUsages.2.java] Usage in extends/implements clause 5 public class X extends Outer.A {
+[kotlinNestedClassAllUsages.1.kt] Class/object property type (6: 21) var next: Outer.A? = Outer.A()
+[kotlinNestedClassAllUsages.1.kt] Companion object (10: 15) Outer.A.bar = ""
+[kotlinNestedClassAllUsages.1.kt] Companion object (11: 15) Outer.A.foo()
+[kotlinNestedClassAllUsages.1.kt] Companion object (5: 37) public class X(bar: String? = Outer.A.bar): Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Companion object (7: 32) val myBar: String? = Outer.A.bar
+[kotlinNestedClassAllUsages.1.kt] Function return types (19: 26) fun getNext(): Outer.A? {
+[kotlinNestedClassAllUsages.1.kt] Function return types (40: 22) fun Any.toA(): Outer.A? {
+[kotlinNestedClassAllUsages.1.kt] Local variable declaration (15: 23) val aa: Outer.A = a
+[kotlinNestedClassAllUsages.1.kt] New instance creation (36: 30) fun X.bar(a: Outer.A = Outer.A()) {
+[kotlinNestedClassAllUsages.1.kt] New instance creation (6: 32) var next: Outer.A? = Outer.A()
+[kotlinNestedClassAllUsages.1.kt] Parameter type (14: 22) fun foo(a: Outer.A) {
+[kotlinNestedClassAllUsages.1.kt] Parameter type (36: 20) fun X.bar(a: Outer.A = Outer.A()) {
+[kotlinNestedClassAllUsages.1.kt] Super type qualifier (24: 21) super<Outer.A>.foo()
+[kotlinNestedClassAllUsages.1.kt] Supertype (27: 29) companion object: Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Supertype (32: 17) object O: Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Supertype (5: 51) public class X(bar: String? = Outer.A.bar): Outer.A() {
+[kotlinNestedClassAllUsages.1.kt] Target type of 'is' operation (41: 30) return if (this is Outer.A) this as Outer.A else null
+[kotlinNestedClassAllUsages.1.kt] Usage in cast target type (41: 47) return if (this is Outer.A) this as Outer.A else null
+[kotlinNestedClassAllUsages.2.java] Field declaration (6: 11) Outer.A next = new Outer.A();
+[kotlinNestedClassAllUsages.2.java] New instance creation (6: 30) Outer.A next = new Outer.A();
+[kotlinNestedClassAllUsages.2.java] Usage in extends/implements clause (5: 30) public class X extends Outer.A {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
index 4378695..91eb967 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.results.txt
@@ -1 +1 @@
-New instance creation 10 open fun processRequest() = Foo()
+New instance creation (10: 33) open fun processRequest() = Foo()
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
index 2cea690..7da9836 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.results.txt
@@ -1,4 +1,4 @@
-[kotlinTraitDerivedAnonymousObjects.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 12 val x = object : X {
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 9 doSomething(object : A() {}, object: X {})
-[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage 9 doSomething(object : A() {}, object: X {})
+[kotlinTraitDerivedAnonymousObjects.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (12: 17) val x = object : X {
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (9: 17) doSomething(object : A() {}, object: X {})
+[kotlinTraitDerivedAnonymousObjects.1.kt] Unclassified usage (9: 34) doSomething(object : A() {}, object: X {})
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
index 0f1b045..b7acb88 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedClasses.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedClasses.1.kt] Unclassified usage 3 open class B: A() {
-[kotlinTraitDerivedClasses.1.kt] Unclassified usage 7 open class C: Y {
+[kotlinTraitDerivedClasses.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedClasses.1.kt] Unclassified usage (3: 12) open class B: A() {
+[kotlinTraitDerivedClasses.1.kt] Unclassified usage (7: 12) open class C: Y {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
index 2dbbeb6..4a08b24 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedInnerClasses.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage 4 open class B: A() {
-[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage 8 open class C: Y {
+[kotlinTraitDerivedInnerClasses.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage (4: 16) open class B: A() {
+[kotlinTraitDerivedInnerClasses.1.kt] Unclassified usage (8: 16) open class C: Y {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
index f46863d..60a804f 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedInnerObjects.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage 4 object O1: A() {
-[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage 9 object O2: X {
+[kotlinTraitDerivedInnerObjects.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage (4: 12) object O1: A() {
+[kotlinTraitDerivedInnerObjects.1.kt] Unclassified usage (9: 16) object O2: X {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
index 990ef3e..f3ece4e 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedLocalClasses.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage 5 open class B: A() {
-[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage 9 open class C: Y {
+[kotlinTraitDerivedLocalClasses.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage (5: 16) open class B: A() {
+[kotlinTraitDerivedLocalClasses.1.kt] Unclassified usage (9: 16) open class C: Y {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
index cd812ff..0b76285 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedLocalObjects.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage 10 object O2: X {
-[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage 5 object O1: A() {
+[kotlinTraitDerivedLocalObjects.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage (10: 16) object O2: X {
+[kotlinTraitDerivedLocalObjects.1.kt] Unclassified usage (5: 12) object O1: A() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
index 5cc8e02..f6afce4 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 10 interface Z: A {
-Unclassified usage 14 interface U: Z {
+Unclassified usage (10: 19) interface Z: A {
+Unclassified usage (14: 19) interface U: Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
index 7b6d207..0743125 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedObjects.0.kt] Unclassified usage 7 open class A: X {
-[kotlinTraitDerivedObjects.1.kt] Unclassified usage 3 object O1: A() {
-[kotlinTraitDerivedObjects.1.kt] Unclassified usage 7 object O2: X {
+[kotlinTraitDerivedObjects.0.kt] Unclassified usage (7: 12) open class A: X {
+[kotlinTraitDerivedObjects.1.kt] Unclassified usage (3: 8) object O1: A() {
+[kotlinTraitDerivedObjects.1.kt] Unclassified usage (7: 8) object O2: X {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
index a94ff5c..2885a17 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
@@ -1,3 +1,3 @@
-[kotlinTraitDerivedTraits.0.kt] Unclassified usage 11 interface Y: X {
-[kotlinTraitDerivedTraits.1.kt] Unclassified usage 11 interface Z: A {
-[kotlinTraitDerivedTraits.1.kt] Unclassified usage 15 interface U: Z {
+[kotlinTraitDerivedTraits.0.kt] Unclassified usage (11: 11) interface Y: X {
+[kotlinTraitDerivedTraits.1.kt] Unclassified usage (11: 11) interface Z: A {
+[kotlinTraitDerivedTraits.1.kt] Unclassified usage (15: 11) interface U: Z {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
index 6a1a096..31640d4 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/localAndNonLocalClass.results.txt
@@ -1 +1 @@
-New instance creation 10 C()
+New instance creation (10: 5) C()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
index 662e84f..6c922e1 100644
--- a/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
+++ b/idea/testData/findUsages/kotlin/findClassUsages/primaryConstructorWithDefaultParams.results.txt
@@ -1,2 +1,2 @@
-New instance creation 6 A(0)
-New instance creation 7 A()
+New instance creation (6: 5) A(0)
+New instance creation (7: 5) A()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
index 43b1bb6..d06564f 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/enumFunctionUsages.results.txt
@@ -1,3 +1,3 @@
-Function call 14 foo(1)
-Function call 21 foo(1)
-Function call 7 foo(1)
+Function call (14: 13) foo(1)
+Function call (21: 9) foo(1)
+Function call (7: 13) foo(1)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
index fb37223..ece64a3 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/functionUsedInPlainText.results.txt
@@ -1 +1 @@
-Unclassified usage 1 Function foo is defined in class Foo
\ No newline at end of file
+Unclassified usage (1: 10) Function foo is defined in class Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
index e221ea2..3fb6c86 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/highlightingOfSuperUsages.results.txt
@@ -1,3 +1,3 @@
-Function call 14 i.foo()
-Function call 15 A().foo()
-Function call 16 B().foo()
+Function call (14: 7) i.foo()
+Function call (15: 9) A().foo()
+Function call (16: 9) B().foo()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
index 3fd4095..70e0612 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.results.txt
@@ -1,2 +1,2 @@
-[javaAndKotlinOverrides.0.kt] Unclassified usage 29 override fun foo(t: String) {
-[javaAndKotlinOverrides.1.java] Unclassified usage 3 public void foo(String s) {
+[javaAndKotlinOverrides.0.kt] Unclassified usage (29: 18) override fun foo(t: String) {
+[javaAndKotlinOverrides.1.java] Unclassified usage (3: 17) public void foo(String s) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
index a5753f3..6061068 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 5 new Server().processRequest();
-Unclassified usage 6 new ServerEx().processRequest();
+Unclassified usage (5: 22) new Server().processRequest();
+Unclassified usage (6: 24) new ServerEx().processRequest();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
index 2a41be2..3f5d017 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 11 Foo.foo(1, 1.0);
-Unclassified usage 15 Foo.foo(1, 1.0, "1");
-Unclassified usage 3 Foo.foo();
-Unclassified usage 7 Foo.foo(1);
+Unclassified usage (11: 13) Foo.foo(1, 1.0);
+Unclassified usage (15: 13) Foo.foo(1, 1.0, "1");
+Unclassified usage (3: 13) Foo.foo();
+Unclassified usage (7: 13) Foo.foo(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.results.txt
index 12b5389..6a0b809 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticFun.results.txt
@@ -1 +1 @@
-Unclassified usage 3 Foo.foo();
\ No newline at end of file
+Unclassified usage (3: 13) Foo.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.results.txt
index affa2fb..0e0374e 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/jvmStaticJvmOverloadsFun.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 3 Foo.foo(2);
-Unclassified usage 4 Foo.foo();
\ No newline at end of file
+Unclassified usage (3: 13) Foo.foo(2);
+Unclassified usage (4: 13) Foo.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
index 8964526..afc030e 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinInternalMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call 5 Server().processRequest()
-Function call 6 ServerEx().processRequest()
+Function call (5: 18) Server().processRequest()
+Function call (6: 20) ServerEx().processRequest()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
index d556a99..996c08c 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.results.txt
@@ -1 +1,2 @@
-Function call 8 bar()
+Function call (8: 5) bar()
+
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
index 034575b..b5852c1 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.results.txt
@@ -1 +1,2 @@
-Function call 9 bar()
+Function call (9: 9) bar()
+
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
index 8964526..669a956 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call 5 Server().processRequest()
-Function call 6 ServerEx().processRequest()
+Function call (5: 18) Server().processRequest()
+Function call (6: 20) ServerEx().processRequest()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
index 4a1d3c7..6173c25 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMultiRefInImport.results.txt
@@ -1,2 +1,2 @@
-Function call 8 foo()
-Usage in import 5 import server.foo
+Function call (8: 5) foo()
+Usage in import (5: 15) import server.foo
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
index 90e10d6..1c61730 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinNestedClassMethodUsages.results.txt
@@ -1 +1 @@
-Unclassified usage 7 new Outer.Inner().foo();
+Unclassified usage (7: 27) new Outer.Inner().foo();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
index ee51ac2..79178a3 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt
@@ -1,7 +1,7 @@
-[kotlinOverloadAndExtensionUsages.0.kt] Function call 11 x.foo(1, 2)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call 25 foo(t)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call 30 a.foo(1, "")
-[kotlinOverloadAndExtensionUsages.0.kt] Function call 35 foo(t)
-[kotlinOverloadAndExtensionUsages.0.kt] Function call 39 foo(s)
-[kotlinOverloadAndExtensionUsages.1.kt] Function call 11 a.foo(0, "")
-[kotlinOverloadAndExtensionUsages.1.kt] Function call 3 super<A>.foo(t)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call (11: 7) x.foo(1, 2)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call (25: 5) foo(t)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call (30: 7) a.foo(1, "")
+[kotlinOverloadAndExtensionUsages.0.kt] Function call (35: 9) foo(t)
+[kotlinOverloadAndExtensionUsages.0.kt] Function call (39: 5) foo(s)
+[kotlinOverloadAndExtensionUsages.1.kt] Function call (11: 11) a.foo(0, "")
+[kotlinOverloadAndExtensionUsages.1.kt] Function call (3: 18) super<A>.foo(t)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
index 1254183..be31093 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.results.txt
@@ -1,3 +1,3 @@
-Function call 11 O.foo()
-Function call 3 a.foo("")
-Function call 7 x.foo(0)
+Function call (11: 11) O.foo()
+Function call (3: 11) a.foo("")
+Function call (7: 11) x.foo(0)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
index 3de7eba..d82ebc4 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.results.txt
@@ -1 +1 @@
-Function call 8 open fun processRequest() = doProcessRequest()
\ No newline at end of file
+Function call (8: 33) open fun processRequest() = doProcessRequest()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
index 0b7e320..eaccce8 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.results.txt
@@ -1,5 +1,5 @@
-[kotlinTopLevelMethodUsages.1.kt] Callable reference 6 val methodRef = ::processRequest()
-[kotlinTopLevelMethodUsages.1.kt] Function call 10 processRequest()
-[kotlinTopLevelMethodUsages.1.kt] Usage in import 3 import server.processRequest
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage 6 String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
-[kotlinTopLevelMethodUsages.2.java] Unclassified usage 9 return KotlinTopLevelMethodUsages_0Kt.processRequest();
+[kotlinTopLevelMethodUsages.1.kt] Callable reference (6: 23) val methodRef = ::processRequest()
+[kotlinTopLevelMethodUsages.1.kt] Function call (10: 9) processRequest()
+[kotlinTopLevelMethodUsages.1.kt] Usage in import (3: 15) import server.processRequest
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage (6: 47) String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
+[kotlinTopLevelMethodUsages.2.java] Unclassified usage (9: 47) return KotlinTopLevelMethodUsages_0Kt.processRequest();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
index 2aaa04c..a634df2 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesMultifile.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 6 String s = RequestProcessor.processRequest();
-Unclassified usage 9 return RequestProcessor.processRequest();
+Unclassified usage (6: 33) String s = RequestProcessor.processRequest();
+Unclassified usage (9: 33) return RequestProcessor.processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
index 43ff380..f5e49f9 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.results.txt
@@ -1,2 +1,2 @@
-Callable reference 6 val methodRef = ::processRequest()
-Function call 10 processRequest()
+Callable reference (6: 23) val methodRef = ::processRequest()
+Function call (10: 9) processRequest()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
index 2aaa04c..a634df2 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesWithRenamedFile.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 6 String s = RequestProcessor.processRequest();
-Unclassified usage 9 return RequestProcessor.processRequest();
+Unclassified usage (6: 33) String s = RequestProcessor.processRequest();
+Unclassified usage (9: 33) return RequestProcessor.processRequest();
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
index 9c77d57..5f8e4c1 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
-[kotlinTraitImplThroughDelegate.0.kt] Function call 11 fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
-[kotlinTraitImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
+[kotlinTraitImplThroughDelegate.0.kt] Function call (11: 53) fun test(twdwi: TraitWithDelegatedWithImpl) = twdwi.foo()
+[kotlinTraitImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
index 0013511..9ae5d59 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTraitNoImplThroughDelegate.results.txt
@@ -1,2 +1,2 @@
-[kotlinTraitNoImplThroughDelegate.0.kt] Function call 11 fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
-[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage 7 some.foo();
+[kotlinTraitNoImplThroughDelegate.0.kt] Function call (11: 51) fun test(twdni: TraitWithDelegatedNoImpl) = twdni.foo()
+[kotlinTraitNoImplThroughDelegate.1.java] Unclassified usage (7: 14) some.foo();
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
index 6ad941c..8bce9f7 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/localClassMember.results.txt
@@ -1 +1 @@
-Function call 11 LocalClass().f()
+Function call (11: 18) LocalClass().f()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
index 267a51d..afa35e6 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionDeepMember.results.txt
@@ -1 +1 @@
-Value read 14 a.b.c.d
+Value read (14: 11) a.b.c.d
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
index f85574d..82353d5 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember.results.txt
@@ -1 +1 @@
-Function call 11 localObject.f()
+Function call (11: 17) localObject.f()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
index 850f2be..49fe2eb 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMember2.results.txt
@@ -1 +1 @@
-Function call 11 localObject().f()
+Function call (11: 19) localObject().f()
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
index 9ebf98c..f54c371 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/objectExpressionMemberInClass.results.txt
@@ -1 +1 @@
-Function call 10 localObject.f()
+Function call (10: 21) localObject.f()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
index da0c3cd..81e9b32 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.results.txt
@@ -1 +1 @@
-Function call 12 B(0).copy(1)
+Function call (12: 10) B(0).copy(1)
diff --git a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
index 379e694..c2c40dd 100644
--- a/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
+++ b/idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.results.txt
@@ -1 +1 @@
-Function call 13 a.foo()
+Function call (13: 7) a.foo()
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
index b22d28a..8403305 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesK.results.txt
@@ -1,16 +1,16 @@
-[javaPropertyUsagesK.0.kt] Value read 16 val t = A().p
-[javaPropertyUsagesK.0.kt] Value read 19 val t = AA().p
-[javaPropertyUsagesK.0.kt] Value read 22 val t = J().p
-[javaPropertyUsagesK.0.kt] Value read 25 val t = B().p
-[javaPropertyUsagesK.0.kt] Value write 17 A().p = 1
-[javaPropertyUsagesK.0.kt] Value write 20 AA().p = 1
-[javaPropertyUsagesK.0.kt] Value write 23 J().p = 1
-[javaPropertyUsagesK.0.kt] Value write 26 B().p = 1
-[javaPropertyUsagesK.1.java] Unclassified usage 15 new A().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage 16 new A().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage 18 new AA().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage 19 new AA().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage 21 new J().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage 22 new J().setP(1);
-[javaPropertyUsagesK.1.java] Unclassified usage 24 new B().getP();
-[javaPropertyUsagesK.1.java] Unclassified usage 25 new B().setP(1);
+[javaPropertyUsagesK.0.kt] Value read (16: 17) val t = A().p
+[javaPropertyUsagesK.0.kt] Value read (19: 18) val t = AA().p
+[javaPropertyUsagesK.0.kt] Value read (22: 17) val t = J().p
+[javaPropertyUsagesK.0.kt] Value read (25: 17) val t = B().p
+[javaPropertyUsagesK.0.kt] Value write (17: 9) A().p = 1
+[javaPropertyUsagesK.0.kt] Value write (20: 10) AA().p = 1
+[javaPropertyUsagesK.0.kt] Value write (23: 9) J().p = 1
+[javaPropertyUsagesK.0.kt] Value write (26: 9) B().p = 1
+[javaPropertyUsagesK.1.java] Unclassified usage (15: 17) new A().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage (16: 17) new A().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage (18: 18) new AA().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage (19: 18) new AA().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage (21: 17) new J().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage (22: 17) new J().setP(1);
+[javaPropertyUsagesK.1.java] Unclassified usage (24: 17) new B().getP();
+[javaPropertyUsagesK.1.java] Unclassified usage (25: 17) new B().setP(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
index 60d3af3..01d08a5 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKJK.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyUsagesKJK.0.kt] Value read 25 val t = B().p
-[javaPropertyUsagesKJK.0.kt] Value write 26 B().p = 1
-[javaPropertyUsagesKJK.1.java] Unclassified usage 24 new B().getP();
-[javaPropertyUsagesKJK.1.java] Unclassified usage 25 new B().setP(1);
+[javaPropertyUsagesKJK.0.kt] Value read (25: 17) val t = B().p
+[javaPropertyUsagesKJK.0.kt] Value write (26: 9) B().p = 1
+[javaPropertyUsagesKJK.1.java] Unclassified usage (24: 17) new B().getP();
+[javaPropertyUsagesKJK.1.java] Unclassified usage (25: 17) new B().setP(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
index 16cbc13..80623f7 100644
--- a/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
+++ b/idea/testData/findUsages/kotlin/findJavaPropertyUsages/javaPropertyUsagesKK.results.txt
@@ -1,4 +1,4 @@
-[javaPropertyUsagesKK.0.kt] Value read 19 val t = AA().p
-[javaPropertyUsagesKK.0.kt] Value write 20 AA().p = 1
-[javaPropertyUsagesKK.1.java] Unclassified usage 18 new AA().getP();
-[javaPropertyUsagesKK.1.java] Unclassified usage 19 new AA().setP(1);
+[javaPropertyUsagesKK.0.kt] Value read (19: 18) val t = AA().p
+[javaPropertyUsagesKK.0.kt] Value write (20: 10) AA().p = 1
+[javaPropertyUsagesKK.1.java] Unclassified usage (18: 18) new AA().getP();
+[javaPropertyUsagesKK.1.java] Unclassified usage (19: 18) new AA().setP(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
index d9869ae..0fc7f02 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
@@ -1,2 +1,2 @@
-Class static member access 7 System.out.println("foo = " + O.INSTANCE.getFoo());
-Usage in import 3 import server.O;
+Class static member access (7: 39) System.out.println("foo = " + O.INSTANCE.getFoo());
+Usage in import (3: 15) import server.O;
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.results.txt
index b3beb91..457d113 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinImportedObjectUsages.results.txt
@@ -1 +1 @@
-Usage in import 2 import Imported as Alias
+Usage in import (2: 8) import Imported as Alias
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
index 6cf46b7..8807895 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.results.txt
@@ -1 +1 @@
-Value read 6 return Bar
+Value read (6: 12) return Bar
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
index 4c1da42..478b5b2 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.results.txt
@@ -1 +1 @@
-Value read 7 return Bar
+Value read (7: 16) return Bar
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
index 0aa2810..87a7ce5 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.results.txt
@@ -1,3 +1,3 @@
-Receiver 10 println("foo = ${a.O.foo}")
-Usage in import 3 import a.A.O
-Value read 11 val obj = a.O
+Receiver (10: 28) println("foo = ${a.O.foo}")
+Usage in import (3: 12) import a.A.O
+Value read (11: 21) val obj = a.O
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
index 98c225d..db7207b 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.results.txt
@@ -1,3 +1,3 @@
-Receiver 7 println("foo = ${O.foo}")
-Usage in import 3 import server.O
-Value read 8 val obj = O
+Receiver (7: 26) println("foo = ${O.foo}")
+Usage in import (3: 15) import server.O
+Value read (8: 19) val obj = O
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
index d6541bc..c847dd8 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.results.txt
@@ -1 +1 @@
-Value read 10 open fun processRequest() = Foo
+Value read (10: 33) open fun processRequest() = Foo
diff --git a/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt b/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
index 0e267a3..94176e5 100644
--- a/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.results.txt
@@ -1,4 +1,4 @@
-Class/object property type 10 val x: foo.bar.X? = foo.bar.X()
-Package directive 4 package foo.bar
-Package member access 10 val x: foo.bar.X? = foo.bar.X()
-Usage in import 6 import foo.bar.X
+Class/object property type (10: 8) val x: foo.bar.X? = foo.bar.X()
+Package directive (4: 9) package foo.bar
+Package member access (10: 21) val x: foo.bar.X? = foo.bar.X()
+Usage in import (6: 8) import foo.bar.X
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
index 88b89f1..3a2c991 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinComponentFunctionParameterUsages.results.txt
@@ -1 +1 @@
-Unclassified usage 5 return dataClass.component1();
+Unclassified usage (5: 26) return dataClass.component1();
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
index 036df13..b7a7150 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.results.txt
@@ -1,4 +1,4 @@
-Named argument 11 return A(foo = ":)")
-Named argument 16 A(foo = ":)")
-Value read 5 println(foo)
-Value read 8 val t: T = foo
+Named argument (11: 18) return A(foo = ":)")
+Named argument (16: 7) A(foo = ":)")
+Value read (5: 17) println(foo)
+Value read (8: 16) val t: T = foo
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
index abc73f7..7301bbd 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.results.txt
@@ -1,3 +1,3 @@
-Named argument 13 foo(t = ":)")
-Value read 4 println(t)
-Value read 5 return t
+Named argument (13: 9) foo(t = ":)")
+Value read (4: 13) println(t)
+Value read (5: 12) return t
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
index 8a4677c..7f45101 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinHighlightParameterUsages.results.txt
@@ -1 +1 @@
-Value read 9 println(foo) // not highlighted `foo`
\ No newline at end of file
+Value read (9: 17) println(foo) // not highlighted `foo`
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
index bd40572..6efc67f 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-New instance creation 11 new A(1, 1.0);
-New instance creation 15 new A(1, 1.0, "1");
-New instance creation 3 new A();
-New instance creation 7 new A(1);
+New instance creation (11: 13) new A(1, 1.0);
+New instance creation (15: 13) new A(1, 1.0, "1");
+New instance creation (3: 13) new A();
+New instance creation (7: 13) new A(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
index 2451f94..526995a 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorByRef.results.txt
@@ -1,4 +1,4 @@
-New instance creation 16 A(1)
-Supertype 12 class C(): A(1)
-Unclassified usage 5 constructor(): this(1)
-Unclassified usage 9 constructor(n: Int): super(n)
+New instance creation (16: 5) A(1)
+Supertype (12: 12) class C(): A(1)
+Unclassified usage (5: 20) constructor(): this(1)
+Unclassified usage (9: 26) constructor(n: Int): super(n)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
index 426cb92..ea2175d 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorNoKeyword.results.txt
@@ -1,4 +1,4 @@
-New instance creation 15 A(1)
-Supertype 11 class C(): A(1)
-Unclassified usage 4 constructor(): this(1)
-Unclassified usage 8 constructor(n: Int): super(n)
+New instance creation (15: 5) A(1)
+Supertype (11: 12) class C(): A(1)
+Unclassified usage (4: 20) constructor(): this(1)
+Unclassified usage (8: 26) constructor(n: Int): super(n)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
index 426cb92..ea2175d 100644
--- a/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
+++ b/idea/testData/findUsages/kotlin/findPrimaryConstructorUsages/primaryConstructorWithKeyword.results.txt
@@ -1,4 +1,4 @@
-New instance creation 15 A(1)
-Supertype 11 class C(): A(1)
-Unclassified usage 4 constructor(): this(1)
-Unclassified usage 8 constructor(n: Int): super(n)
+New instance creation (15: 5) A(1)
+Supertype (11: 12) class C(): A(1)
+Unclassified usage (4: 20) constructor(): this(1)
+Unclassified usage (8: 26) constructor(n: Int): super(n)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
index ae3a529..08e43f8 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.results.txt
@@ -1,4 +1,4 @@
-[javaAndKotlinOverrides.0.kt] Unclassified usage 25 override var foo: String = ""
-[javaAndKotlinOverrides.0.kt] Unclassified usage 8 override var foo: String
-[javaAndKotlinOverrides.1.java] Unclassified usage 12 public void setFoo(String s) {
-[javaAndKotlinOverrides.1.java] Unclassified usage 7 public String getFoo() {
+[javaAndKotlinOverrides.0.kt] Unclassified usage (25: 18) override var foo: String = ""
+[javaAndKotlinOverrides.0.kt] Unclassified usage (8: 18) override var foo: String
+[javaAndKotlinOverrides.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
+[javaAndKotlinOverrides.1.java] Unclassified usage (7: 19) public String getFoo() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
index afb6469..c0b4baf 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.results.txt
@@ -1,5 +1,5 @@
-[javaAndKotlinOverrides2.0.kt] Unclassified usage 23 override var foo: String = ""
-[javaAndKotlinOverrides2.0.kt] Unclassified usage 26 open class E<T>(override var foo: T): A<T>(foo)
-[javaAndKotlinOverrides2.0.kt] Unclassified usage 6 override var foo: String
-[javaAndKotlinOverrides2.1.java] Unclassified usage 12 public void setFoo(String s) {
-[javaAndKotlinOverrides2.1.java] Unclassified usage 7 public String getFoo() {
+[javaAndKotlinOverrides2.0.kt] Unclassified usage (23: 18) override var foo: String = ""
+[javaAndKotlinOverrides2.0.kt] Unclassified usage (26: 30) open class E<T>(override var foo: T): A<T>(foo)
+[javaAndKotlinOverrides2.0.kt] Unclassified usage (6: 18) override var foo: String
+[javaAndKotlinOverrides2.1.java] Unclassified usage (12: 17) public void setFoo(String s) {
+[javaAndKotlinOverrides2.1.java] Unclassified usage (7: 19) public String getFoo() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
index 8d3ff8c..f0574a4 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 10 System.out.println("a.foo = " + A.foo);
-Unclassified usage 7 A.Companion.setFoo("a");
-Unclassified usage 8 A.foo = "a";
-Unclassified usage 9 System.out.println("a.foo = " + A.Companion.getFoo());
+Unclassified usage (10: 43) System.out.println("a.foo = " + A.foo);
+Unclassified usage (7: 21) A.Companion.setFoo("a");
+Unclassified usage (8: 11) A.foo = "a";
+Unclassified usage (9: 53) System.out.println("a.foo = " + A.Companion.getFoo());
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
index 1c963d7..8a8852e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
-Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
+Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
+Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
index 1c963d7..8a8852e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
-Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
+Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
+Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
index 751eddd..7d13c5e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 12 b.setFoo("b");
-Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
-Unclassified usage 8 a.setFoo("a");
-Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
+Unclassified usage (12: 11) b.setFoo("b");
+Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
+Unclassified usage (8: 11) a.setFoo("a");
+Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
index 751eddd..7d13c5e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.results.txt
@@ -1,4 +1,4 @@
-Unclassified usage 12 b.setFoo("b");
-Unclassified usage 13 System.out.println("b.foo = " + b.getFoo());
-Unclassified usage 8 a.setFoo("a");
-Unclassified usage 9 System.out.println("a.foo = " + a.getFoo());
+Unclassified usage (12: 11) b.setFoo("b");
+Unclassified usage (13: 43) System.out.println("b.foo = " + b.getFoo());
+Unclassified usage (8: 11) a.setFoo("a");
+Unclassified usage (9: 43) System.out.println("a.foo = " + a.getFoo());
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
index 2e36107..98bd4c9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 12 b.setFoo("b");
-Unclassified usage 8 a.setFoo("a");
+Unclassified usage (12: 11) b.setFoo("b");
+Unclassified usage (8: 11) a.setFoo("a");
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
index 2e36107..98bd4c9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 12 b.setFoo("b");
-Unclassified usage 8 a.setFoo("a");
+Unclassified usage (12: 11) b.setFoo("b");
+Unclassified usage (8: 11) a.setFoo("a");
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/jvmStaticProperty.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/jvmStaticProperty.results.txt
index 50608d45..f18491e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/jvmStaticProperty.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/jvmStaticProperty.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 3 Foo.getFoo();
-Unclassified usage 4 Foo.setFoo(2);
\ No newline at end of file
+Unclassified usage (3: 13) Foo.getFoo();
+Unclassified usage (4: 13) Foo.setFoo(2);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
index d0a8893..04071ca 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinClassObjectPropertyUsage.results.txt
@@ -1,2 +1,2 @@
-[kotlinClassObjectPropertyUsage.0.kt] Value read 11 val a = Some.XX
-[kotlinClassObjectPropertyUsage.1.java] Unclassified usage 7 int i = Some.XX;
+[kotlinClassObjectPropertyUsage.0.kt] Value read (11: 14) val a = Some.XX
+[kotlinClassObjectPropertyUsage.1.java] Unclassified usage (7: 22) int i = Some.XX;
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
index 4eadbaf..d891953 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.results.txt
@@ -1 +1 @@
-Value read 6 return bar
+Value read (6: 12) return bar
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
index 2a38aee..a6e139e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.results.txt
@@ -1 +1 @@
-Value read 7 return bar
+Value read (7: 16) return bar
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
index f1c0777..a5e2729 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinMultiRefInImport.results.txt
@@ -1,2 +1,2 @@
-Usage in import 5 import server.foo
-Value read 9 val t = 1.foo + foo
+Usage in import (5: 15) import server.foo
+Value read (9: 21) val t = 1.foo + foo
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
index 6b9c17e..c1b47f6 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinNestedClassPropertyUsages.results.txt
@@ -1,2 +1,2 @@
-Unclassified usage 7 int n = new Outer.Inner().getFoo();
-Unclassified usage 8 new Outer.Inner().setFoo(2);
+Unclassified usage (7: 35) int n = new Outer.Inner().getFoo();
+Unclassified usage (8: 27) new Outer.Inner().setFoo(2);
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
index 179a24f..f62cc23 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyInClassObjectUsages.results.txt
@@ -1 +1 @@
-Value read 4 val x = Outer.t
+Value read (4: 19) val x = Outer.t
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
index d2ad55d..a883ff9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.results.txt
@@ -1,2 +1,2 @@
-Value read 12 override fun processRequest() = "foo" + foo
-Value read 8 open fun processRequest() = foo
\ No newline at end of file
+Value read (12: 45) override fun processRequest() = "foo" + foo
+Value read (8: 33) open fun processRequest() = foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
index aa25fe0..8ddf680 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPrivatePropertyUsages2.0.kt] Named argument 9 public class ServerEx(): Server(foo = "!") {
-[kotlinPrivatePropertyUsages2.0.kt] Value read 6 open fun processRequest() = foo
-[kotlinPrivatePropertyUsages2.1.kt] Named argument 5 println(Server(foo = "!").foo)
\ No newline at end of file
+[kotlinPrivatePropertyUsages2.0.kt] Named argument (9: 33) public class ServerEx(): Server(foo = "!") {
+[kotlinPrivatePropertyUsages2.0.kt] Value read (6: 33) open fun processRequest() = foo
+[kotlinPrivatePropertyUsages2.1.kt] Named argument (5: 24) println(Server(foo = "!").foo)
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
index 0ed531f..a7a80e9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyReadUsages.0.kt] Value read 13 return super<A>.foo
-[kotlinPropertyReadUsages.1.kt] Value read 11 println("b.foo = ${b.foo}")
-[kotlinPropertyReadUsages.1.kt] Value read 7 println("a.foo = ${a.foo}")
+[kotlinPropertyReadUsages.0.kt] Value read (13: 29) return super<A>.foo
+[kotlinPropertyReadUsages.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
+[kotlinPropertyReadUsages.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
index 2c5adfe..90bac11 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyReadUsages2.0.kt] Value read 11 return super<A>.foo
-[kotlinPropertyReadUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}")
-[kotlinPropertyReadUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}")
+[kotlinPropertyReadUsages2.0.kt] Value read (11: 29) return super<A>.foo
+[kotlinPropertyReadUsages2.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
+[kotlinPropertyReadUsages2.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
index 6cfee77..00f20a9 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages.0.kt] Value read 13 return super<A>.foo
-[kotlinPropertyUsages.0.kt] Value write 17 super<A>.foo = value
-[kotlinPropertyUsages.1.kt] Value read 11 println("b.foo = ${b.foo}")
-[kotlinPropertyUsages.1.kt] Value read 7 println("a.foo = ${a.foo}")
-[kotlinPropertyUsages.1.kt] Value write 10 b.foo = "b"
-[kotlinPropertyUsages.1.kt] Value write 6 a.foo = "a"
+[kotlinPropertyUsages.0.kt] Value read (13: 29) return super<A>.foo
+[kotlinPropertyUsages.0.kt] Value write (17: 22) super<A>.foo = value
+[kotlinPropertyUsages.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
+[kotlinPropertyUsages.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
+[kotlinPropertyUsages.1.kt] Value write (10: 11) b.foo = "b"
+[kotlinPropertyUsages.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
index 05c937f..9ffb6e1 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages2.0.kt] Value read 11 return super<A>.foo
-[kotlinPropertyUsages2.0.kt] Value write 15 super<A>.foo = value
-[kotlinPropertyUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}")
-[kotlinPropertyUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}")
-[kotlinPropertyUsages2.1.kt] Value write 10 b.foo = "b"
-[kotlinPropertyUsages2.1.kt] Value write 6 a.foo = "a"
+[kotlinPropertyUsages2.0.kt] Value read (11: 29) return super<A>.foo
+[kotlinPropertyUsages2.0.kt] Value write (15: 22) super<A>.foo = value
+[kotlinPropertyUsages2.1.kt] Value read (11: 30) println("b.foo = ${b.foo}")
+[kotlinPropertyUsages2.1.kt] Value read (7: 30) println("a.foo = ${a.foo}")
+[kotlinPropertyUsages2.1.kt] Value write (10: 11) b.foo = "b"
+[kotlinPropertyUsages2.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
index 90a830f..ef7cd7d 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyWriteUsages.0.kt] Value write 17 super<A>.foo = value
-[kotlinPropertyWriteUsages.1.kt] Value write 10 b.foo = "b"
-[kotlinPropertyWriteUsages.1.kt] Value write 6 a.foo = "a"
+[kotlinPropertyWriteUsages.0.kt] Value write (17: 22) super<A>.foo = value
+[kotlinPropertyWriteUsages.1.kt] Value write (10: 11) b.foo = "b"
+[kotlinPropertyWriteUsages.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
index 174802c..d9da3a3 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt
@@ -1,3 +1,3 @@
-[kotlinPropertyWriteUsages2.0.kt] Value write 15 super<A>.foo = value
-[kotlinPropertyWriteUsages2.1.kt] Value write 10 b.foo = "b"
-[kotlinPropertyWriteUsages2.1.kt] Value write 6 a.foo = "a"
+[kotlinPropertyWriteUsages2.0.kt] Value write (15: 22) super<A>.foo = value
+[kotlinPropertyWriteUsages2.1.kt] Value write (10: 11) b.foo = "b"
+[kotlinPropertyWriteUsages2.1.kt] Value write (6: 11) a.foo = "a"
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
index 8ee0a25..ddcad3e 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinTopLevelPropertyUsages.1.kt] Receiver 8 println("length: ${server.foo.length()}")
-[kotlinTopLevelPropertyUsages.1.kt] Usage in import 3 import server.foo
-[kotlinTopLevelPropertyUsages.1.kt] Value read 7 println("foo = ${server.foo}")
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 7 System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 8 System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
-[kotlinTopLevelPropertyUsages.2.java] Unclassified usage 9 KotlinTopLevelPropertyUsages_0Kt.setFoo("");
+[kotlinTopLevelPropertyUsages.1.kt] Receiver (8: 35) println("length: ${server.foo.length()}")
+[kotlinTopLevelPropertyUsages.1.kt] Usage in import (3: 15) import server.foo
+[kotlinTopLevelPropertyUsages.1.kt] Value read (7: 33) println("foo = ${server.foo}")
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (7: 72) System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (8: 74) System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
+[kotlinTopLevelPropertyUsages.2.java] Unclassified usage (9: 42) KotlinTopLevelPropertyUsages_0Kt.setFoo("");
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt b/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
index abd1832..46482ea 100644
--- a/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
+++ b/idea/testData/findUsages/kotlin/findPropertyUsages/kt7656.results.txt
@@ -1 +1 @@
-Unclassified usage 10 println(a.field)
\ No newline at end of file
+Unclassified usage (10: 15) println(a.field)
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
index eb03e14..d487b09 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/defaultSecondaryConstructor.results.txt
@@ -1,8 +1,8 @@
-[defaultSecondaryConstructor.0.kt] New instance creation 28 B()
-[defaultSecondaryConstructor.0.kt] Supertype 23 class C : B() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage 14 constructor(a: Int) : super() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage 18 constructor() {
-[defaultSecondaryConstructor.0.kt] Unclassified usage 8 constructor(a: Int): this() {
-[defaultSecondaryConstructor.1.java] New instance creation 11 new B();
-[defaultSecondaryConstructor.1.java] Unclassified usage 3 super();
-[defaultSecondaryConstructor.1.java] Unclassified usage 6 public J() {
+[defaultSecondaryConstructor.0.kt] New instance creation (28: 5) B()
+[defaultSecondaryConstructor.0.kt] Supertype (23: 11) class C : B() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage (14: 27) constructor(a: Int) : super() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage (18: 18) constructor() {
+[defaultSecondaryConstructor.0.kt] Unclassified usage (8: 26) constructor(a: Int): this() {
+[defaultSecondaryConstructor.1.java] New instance creation (11: 13) new B();
+[defaultSecondaryConstructor.1.java] Unclassified usage (3: 9) super();
+[defaultSecondaryConstructor.1.java] Unclassified usage (6: 12) public J() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
index bd40572..6efc67f 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/jvmOverloaded.results.txt
@@ -1,4 +1,4 @@
-New instance creation 11 new A(1, 1.0);
-New instance creation 15 new A(1, 1.0, "1");
-New instance creation 3 new A();
-New instance creation 7 new A(1);
+New instance creation (11: 13) new A(1, 1.0);
+New instance creation (15: 13) new A(1, 1.0, "1");
+New instance creation (3: 13) new A();
+New instance creation (7: 13) new A(1);
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
index 70275ab..ee02b82 100644
--- a/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
+++ b/idea/testData/findUsages/kotlin/findSecondaryConstructorUsages/secondaryConstructor.results.txt
@@ -1,6 +1,6 @@
-[secondaryConstructor.0.kt] New instance creation 24 B("")
-[secondaryConstructor.0.kt] Supertype 19 class C: B("") {
-[secondaryConstructor.0.kt] Unclassified usage 14 constructor(a: Int) : super("") {
-[secondaryConstructor.0.kt] Unclassified usage 4 constructor(): this("") {
-[secondaryConstructor.1.java] New instance creation 7 new B("");
-[secondaryConstructor.1.java] Unclassified usage 3 super("");
+[secondaryConstructor.0.kt] New instance creation (24: 5) B("")
+[secondaryConstructor.0.kt] Supertype (19: 10) class C: B("") {
+[secondaryConstructor.0.kt] Unclassified usage (14: 27) constructor(a: Int) : super("") {
+[secondaryConstructor.0.kt] Unclassified usage (4: 20) constructor(): this("") {
+[secondaryConstructor.1.java] New instance creation (7: 13) new B("");
+[secondaryConstructor.1.java] Unclassified usage (3: 9) super("");
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
index df414c3..4565a4a 100644
--- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.results.txt
@@ -1,6 +1,6 @@
-Class/object property type 10 val t: T = foo
-Extension receiver type 5 fun T.bar() {}
-Function return types 11 fun bar(t: T): T = t
-Parameter type 11 fun bar(t: T): T = t
-Parameter type 3 open class A<T>(foo: T, list: List<T>) {
-Type parameter 3 open class A<T>(foo: T, list: List<T>) {
+Class/object property type (10: 12) val t: T = foo
+Extension receiver type (5: 13) fun T.bar() {}
+Function return types (11: 20) fun bar(t: T): T = t
+Parameter type (11: 16) fun bar(t: T): T = t
+Parameter type (3: 22) open class A<T>(foo: T, list: List<T>) {
+Type parameter (3: 36) open class A<T>(foo: T, list: List<T>) {
diff --git a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
index 7446bcd..2d86633 100644
--- a/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.results.txt
@@ -1,4 +1,4 @@
-Extension receiver type 3 fun <T> T.foo(t: T, list: List<T>): T {
-Function return types 3 fun <T> T.foo(t: T, list: List<T>): T {
-Parameter type 3 fun <T> T.foo(t: T, list: List<T>): T {
-Type parameter 3 fun <T> T.foo(t: T, list: List<T>): T {
+Extension receiver type (3: 9) fun <T> T.foo(t: T, list: List<T>): T {
+Function return types (3: 37) fun <T> T.foo(t: T, list: List<T>): T {
+Parameter type (3: 18) fun <T> T.foo(t: T, list: List<T>): T {
+Type parameter (3: 32) fun <T> T.foo(t: T, list: List<T>): T {
diff --git a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
index 1b3d14a..255bbb7 100644
--- a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.results.txt
@@ -1 +1 @@
-New instance creation 5 val a = Test()
+New instance creation (5: 9) val a = Test()
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
index 8d2cd12..94964d2 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.results.txt
@@ -1,16 +1,16 @@
-Class/object property type (Client) 6 var nextServer: Server? = new Server()
-Companion object (Client) 5 class Client(name: String = Server.NAME): Server() {
-Companion object (Client) 7 val name = Server.NAME
-Companion object (bar) 32 fun Client.bar(s: Server = Server.NAME) {
-Function return types (Client) 14 fun getNextServer(): Server? {
-Function return types (asServer) 40 fun Any.asServer(): Server? {
-Local variable declaration (Client) 10 val server: Server = s
-Parameter type (Client) 9 fun foo(s: Server) {
-Parameter type (bar) 32 fun Client.bar(s: Server = Server.NAME) {
-Super type qualifier (Client) 19 super<Server>.work()
-Supertype (Client) 23 companion object: Server() {
-Supertype (Client) 5 class Client(name: String = Server.NAME): Server() {
-Supertype (ClientObject) 28 object ClientObject: Server() {
-Target type of 'is' operation (asServer) 41 return if (this is Server) this as Server else null
-Usage in cast target type (asServer) 41 return if (this is Server) this as Server else null
-Usage in import 3 import server.Server
+Class/object property type (Client) (6: 21) var nextServer: Server? = new Server()
+Companion object (Client) (5: 29) class Client(name: String = Server.NAME): Server() {
+Companion object (Client) (7: 16) val name = Server.NAME
+Companion object (bar) (32: 28) fun Client.bar(s: Server = Server.NAME) {
+Function return types (Client) (14: 26) fun getNextServer(): Server? {
+Function return types (asServer) (40: 21) fun Any.asServer(): Server? {
+Local variable declaration (Client) (10: 21) val server: Server = s
+Parameter type (Client) (9: 16) fun foo(s: Server) {
+Parameter type (bar) (32: 19) fun Client.bar(s: Server = Server.NAME) {
+Super type qualifier (Client) (19: 15) super<Server>.work()
+Supertype (Client) (23: 23) companion object: Server() {
+Supertype (Client) (5: 43) class Client(name: String = Server.NAME): Server() {
+Supertype (ClientObject) (28: 22) object ClientObject: Server() {
+Target type of 'is' operation (asServer) (41: 24) return if (this is Server) this as Server else null
+Usage in cast target type (asServer) (41: 40) return if (this is Server) this as Server else null
+Usage in import (3: 15) import server.Server
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
index 84b1a65..2a13ada 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.results.txt
@@ -1,2 +1,2 @@
-Function call (Client) 5 Server().processRequest()
-Function call (Client) 6 ServerEx().processRequest()
+Function call (Client) (5: 18) Server().processRequest()
+Function call (Client) (6: 20) ServerEx().processRequest()
diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
index 225f4fe..0df41fc 100644
--- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt
@@ -1,6 +1,6 @@
-[kotlinPropertyUsages.0.kt] Value read (B) 14 return super<A>.foo
-[kotlinPropertyUsages.0.kt] Value write (B) 18 super<A>.foo = value
-[kotlinPropertyUsages.1.kt] Value read (Client) 11 println("b.foo = ${b.foo}")
-[kotlinPropertyUsages.1.kt] Value read (Client) 7 println("a.foo = ${a.foo}")
-[kotlinPropertyUsages.1.kt] Value write (Client) 10 b.foo = "b"
-[kotlinPropertyUsages.1.kt] Value write (Client) 6 a.foo = "a"
+[kotlinPropertyUsages.0.kt] Value read (B) (14: 29) return super<A>.foo
+[kotlinPropertyUsages.0.kt] Value write (B) (18: 22) super<A>.foo = value
+[kotlinPropertyUsages.1.kt] Value read (Client) (11: 30) println("b.foo = ${b.foo}")
+[kotlinPropertyUsages.1.kt] Value read (Client) (7: 30) println("a.foo = ${a.foo}")
+[kotlinPropertyUsages.1.kt] Value write (Client) (10: 11) b.foo = "b"
+[kotlinPropertyUsages.1.kt] Value write (Client) (6: 11) a.foo = "a"
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt b/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
index 1b5fa5e..870386f 100644
--- a/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/propertyFiles/propertyFileUsagesByRef.results.txt
@@ -1,2 +1,2 @@
-[propertyFileUsagesByRef.0.kt] Usage in string constants 5 public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") key: String) = key
-[propertyFileUsagesByRef.1.java] Method parameter declaration 4 static String message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") String key, Object... args) {
+[propertyFileUsagesByRef.0.kt] Usage in string constants (5: 51) public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") key: String) = key
+[propertyFileUsagesByRef.1.java] Method parameter declaration (4: 58) static String message(@PropertyKey(resourceBundle = "idea.testData.findUsages.kotlin.propertyFiles.propertyFileUsagesByRef.2") String key, Object... args) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt b/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
index 67a0f74..646f7c8 100644
--- a/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
+++ b/idea/testData/findUsages/kotlin/propertyFiles/propertyUsagesByRef.results.txt
@@ -1,2 +1,2 @@
-[propertyUsagesByRef.0.kt] Usage in string constants 8 message("foo.bar")
-[propertyUsagesByRef.1.java] Usage in string constants 3 PropertyUsages_1Kt.message("foo.bar");
+[propertyUsagesByRef.0.kt] Usage in string constants (8: 14) message("foo.bar")
+[propertyUsagesByRef.1.java] Usage in string constants (3: 37) PropertyUsages_1Kt.message("foo.bar");
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
index 6c930f1..1881962 100644
--- a/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
+++ b/idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.results.txt
@@ -1 +1 @@
-Usage in extends/implements clause 1 public class Client extends Foo {}
+Usage in extends/implements clause (1: 29) public class Client extends Foo {}
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt b/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
index 9bc5c99..92e10ee 100644
--- a/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/plusAssignFun.results.txt
@@ -1 +1 @@
-Value read 9 c += 10
+Value read (9: 5) c += 10
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/variable/readAccess.results.txt b/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
index db23e7e..7ea37e1 100644
--- a/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/readAccess.results.txt
@@ -1,6 +1,6 @@
-Value read 10 print(-v)
-Value read 7 print(v)
-Value write 11 v += 1
-Value write 12 (v) -= 1
-Value write 8 ++ @X v
-Value write 9 v--
+Value read (10: 12) print(-v)
+Value read (7: 11) print(v)
+Value write (11: 5) v += 1
+Value write (12: 6) (v) -= 1
+Value write (8: 11) ++ @X v
+Value write (9: 5) v--
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt b/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
index c9841b0..f4abeaf 100644
--- a/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
+++ b/idea/testData/findUsages/kotlin/variable/writeAccess.results.txt
@@ -1,5 +1,5 @@
-Value write 11 v += 1
-Value write 12 (v) -= 1
-Value write 6 (@X v) = 2
-Value write 8 ++ @X v
-Value write 9 v--
+Value write (11: 5) v += 1
+Value write (12: 6) (v) -= 1
+Value write (6: 9) (@X v) = 2
+Value write (8: 11) ++ @X v
+Value write (9: 5) v--
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
index 6d049d2..a0fc5fe 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryClassUsages.results.txt
@@ -1,2 +1,2 @@
-Local variable declaration 9 val foo: Foo
-Usage in import 6 import library.Foo
+Local variable declaration (9: 14) val foo: Foo
+Usage in import (6: 16) import library.Foo
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
index 0babe0f..4f212dc 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryConstructorUsages.results.txt
@@ -1 +1 @@
-New instance creation 9 Foo(1)
+New instance creation (9: 5) Foo(1)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
index 211a479..343f494 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryFieldUsages.results.txt
@@ -1 +1 @@
-Value write 9 Foo().x = 1
+Value write (9: 11) Foo().x = 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
index 6465671..e8a6282 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt
@@ -1 +1 @@
-Function call 9 Foo().bar(1)
+Function call (9: 11) Foo().bar(1)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
index 870088b..086f8c4 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticFieldUsages.results.txt
@@ -1 +1 @@
-Value write 9 Foo.X = 1
+Value write (9: 9) Foo.X = 1
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
index 254d204..8ebf107 100644
--- a/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/javaLibrary/LibraryStaticMethodUsages.results.txt
@@ -1 +1 @@
-Function call 9 Foo.baz(1)
+Function call (9: 9) Foo.baz(1)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
index b45be88..c27901a 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryClassUsages.results.txt
@@ -1,24 +1,24 @@
-[LibraryClassUsages.0.kt] Local variable declaration 16 val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation 16 val a: A = A()
-[LibraryClassUsages.0.kt] New instance creation 17 val aa = A(1)
-[LibraryClassUsages.0.kt] Supertype 13 class Y(): A(1)
-[LibraryClassUsages.0.kt] Supertype 9 class X: A {
-[LibraryClassUsages.1.java] Local variable declaration 11 A a = new A();
-[LibraryClassUsages.1.java] Local variable declaration 12 A aa = new A(1);
-[LibraryClassUsages.1.java] New instance creation 11 A a = new A();
-[LibraryClassUsages.1.java] New instance creation 12 A aa = new A(1);
-[LibraryClassUsages.1.java] Usage in extends/implements clause 5 class J extends A {
-[library.kt] Nested class/object 63 val t = A.T(1)
-[library.kt] Nested class/object 64 val tt = A.T()
-[library.kt] New instance creation 57 val a = A(1)
-[library.kt] New instance creation 58 val aa = A()
-[library.kt] Supertype 19 class B: A {
-[library.kt] Supertype 22 class U: A.T {
-[library.kt] Supertype 27 class C(): A(1) {
-[library.kt] Supertype 28 class V(): A.T(1)
-[library.kt] Supertype 31 class BB: A {
-[library.kt] Supertype 34 class UU: A.T {
-[library.kt] Supertype 39 class CC(): A() {
-[library.kt] Supertype 40 class VV(): A.T()
-[library.kt] Unclassified usage 61 val ff = A::foo
-[library.kt] Unclassified usage 66 val fff = A.T::bar
+[LibraryClassUsages.0.kt] Local variable declaration (16: 12) val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation (16: 16) val a: A = A()
+[LibraryClassUsages.0.kt] New instance creation (17: 14) val aa = A(1)
+[LibraryClassUsages.0.kt] Supertype (13: 12) class Y(): A(1)
+[LibraryClassUsages.0.kt] Supertype (9: 10) class X: A {
+[LibraryClassUsages.1.java] Local variable declaration (11: 9) A a = new A();
+[LibraryClassUsages.1.java] Local variable declaration (12: 9) A aa = new A(1);
+[LibraryClassUsages.1.java] New instance creation (11: 19) A a = new A();
+[LibraryClassUsages.1.java] New instance creation (12: 20) A aa = new A(1);
+[LibraryClassUsages.1.java] Usage in extends/implements clause (5: 17) class J extends A {
+[library.kt] Nested class/object (63: 13) val t = A.T(1)
+[library.kt] Nested class/object (64: 14) val tt = A.T()
+[library.kt] New instance creation (57: 13) val a = A(1)
+[library.kt] New instance creation (58: 14) val aa = A()
+[library.kt] Supertype (19: 10) class B: A {
+[library.kt] Supertype (22: 14) class U: A.T {
+[library.kt] Supertype (27: 12) class C(): A(1) {
+[library.kt] Supertype (28: 16) class V(): A.T(1)
+[library.kt] Supertype (31: 11) class BB: A {
+[library.kt] Supertype (34: 15) class UU: A.T {
+[library.kt] Supertype (39: 13) class CC(): A() {
+[library.kt] Supertype (40: 17) class VV(): A.T()
+[library.kt] Unclassified usage (61: 14) val ff = A::foo
+[library.kt] Unclassified usage (66: 15) val fff = A.T::bar
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
index d672587..e49ece3 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryCompanionObjectUsages.results.txt
@@ -1,3 +1,3 @@
-[LibraryCompanionObjectUsages.0.kt] Companion object 10 val a = A.Companion
-[LibraryCompanionObjectUsages.1.java] Local variable declaration 7 A.Companion o = A.Companion;
-[LibraryCompanionObjectUsages.1.java] Unclassified usage 7 A.Companion o = A.Companion;
\ No newline at end of file
+[LibraryCompanionObjectUsages.0.kt] Companion object (10: 15) val a = A.Companion
+[LibraryCompanionObjectUsages.1.java] Local variable declaration (7: 11) A.Companion o = A.Companion;
+[LibraryCompanionObjectUsages.1.java] Unclassified usage (7: 27) A.Companion o = A.Companion;
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
index 63ea0a8..237ad8b 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryEnumEntryUsages.results.txt
@@ -1 +1 @@
-Value read 9 E.ONE
+Value read (9: 7) E.ONE
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
index 69046be..456aecf 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryFunctionUsages.0.kt] Callable reference 10 val f = ::foo
-[LibraryFunctionUsages.0.kt] Function call 11 foo()
-[library.kt] Callable reference 53 val f = ::foo
-[library.kt] Function call 52 foo()
+[LibraryFunctionUsages.0.kt] Callable reference (10: 15) val f = ::foo
+[LibraryFunctionUsages.0.kt] Function call (11: 5) foo()
+[library.kt] Callable reference (53: 15) val f = ::foo
+[library.kt] Function call (52: 5) foo()
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
index 3c97939..4886eb9 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt
@@ -1,5 +1,5 @@
-[LibraryMemberFunctionUsages.0.kt] Callable reference 10 val f = A::foo
-[LibraryMemberFunctionUsages.0.kt] Function call 11 A().foo(1)
-[LibraryMemberFunctionUsages.1.java] Unclassified usage 11 new A().foo(1);
-[library.kt] Callable reference 61 val ff = A::foo
-[library.kt] Function call 60 a.foo(2)
\ No newline at end of file
+[LibraryMemberFunctionUsages.0.kt] Callable reference (10: 16) val f = A::foo
+[LibraryMemberFunctionUsages.0.kt] Function call (11: 9) A().foo(1)
+[LibraryMemberFunctionUsages.1.java] Unclassified usage (11: 17) new A().foo(1);
+[library.kt] Callable reference (61: 17) val ff = A::foo
+[library.kt] Function call (60: 7) a.foo(2)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
index cec5ef6..5252e10 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference 10 val f = A.T::bar
-[LibraryNestedClassMemberFunctionUsages.0.kt] Function call 11 A.T().bar(1)
-[library.kt] Callable reference 66 val fff = A.T::bar
-[library.kt] Function call 65 t.bar(2)
+[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference (10: 18) val f = A.T::bar
+[LibraryNestedClassMemberFunctionUsages.0.kt] Function call (11: 11) A.T().bar(1)
+[library.kt] Callable reference (66: 20) val fff = A.T::bar
+[library.kt] Function call (65: 7) t.bar(2)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
index 5e7d459..3981b4d 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation 17 val aa = A.T(1)
-[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype 13 class Y(): A.T(1)
-[library.kt] New instance creation 63 val t = A.T(1)
-[library.kt] Supertype 28 class V(): A.T(1)
+[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation (17: 16) val aa = A.T(1)
+[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype (13: 14) class Y(): A.T(1)
+[library.kt] New instance creation (63: 15) val t = A.T(1)
+[library.kt] Supertype (28: 18) class V(): A.T(1)
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
index b5be9d8..bb05e6ef 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation 16 val a: A.T = A.T()
-[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A.T()
-[library.kt] New instance creation 64 val tt = A.T()
-[library.kt] Supertype 40 class VV(): A.T()
+[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation (16: 20) val a: A.T = A.T()
+[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype (13: 14) class Y(): A.T()
+[library.kt] New instance creation (64: 16) val tt = A.T()
+[library.kt] Supertype (40: 19) class VV(): A.T()
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
index 02b7f6c..e7c084a 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt
@@ -1,17 +1,17 @@
-[LibraryNestedClassUsages.0.kt] Local variable declaration 16 val a: A.T = A.T()
-[LibraryNestedClassUsages.0.kt] New instance creation 16 val a: A.T = A.T()
-[LibraryNestedClassUsages.0.kt] New instance creation 17 val aa = A.T(1)
-[LibraryNestedClassUsages.0.kt] Supertype 13 class Y(): A.T(1)
-[LibraryNestedClassUsages.0.kt] Supertype 9 class X: A.T {
-[LibraryNestedClassUsages.1.java] Local variable declaration 11 A.T t = new A.T();
-[LibraryNestedClassUsages.1.java] Local variable declaration 12 A.T tt = new A.T(1);
-[LibraryNestedClassUsages.1.java] New instance creation 11 A.T t = new A.T();
-[LibraryNestedClassUsages.1.java] New instance creation 12 A.T tt = new A.T(1);
-[LibraryNestedClassUsages.1.java] Usage in extends/implements clause 5 class J extends A.T {
-[library.kt] New instance creation 63 val t = A.T(1)
-[library.kt] New instance creation 64 val tt = A.T()
-[library.kt] Supertype 22 class U: A.T {
-[library.kt] Supertype 28 class V(): A.T(1)
-[library.kt] Supertype 34 class UU: A.T {
-[library.kt] Supertype 40 class VV(): A.T()
-[library.kt] Unclassified usage 66 val fff = A.T::bar
+[LibraryNestedClassUsages.0.kt] Local variable declaration (16: 14) val a: A.T = A.T()
+[LibraryNestedClassUsages.0.kt] New instance creation (16: 20) val a: A.T = A.T()
+[LibraryNestedClassUsages.0.kt] New instance creation (17: 16) val aa = A.T(1)
+[LibraryNestedClassUsages.0.kt] Supertype (13: 14) class Y(): A.T(1)
+[LibraryNestedClassUsages.0.kt] Supertype (9: 12) class X: A.T {
+[LibraryNestedClassUsages.1.java] Local variable declaration (11: 11) A.T t = new A.T();
+[LibraryNestedClassUsages.1.java] Local variable declaration (12: 11) A.T tt = new A.T(1);
+[LibraryNestedClassUsages.1.java] New instance creation (11: 23) A.T t = new A.T();
+[LibraryNestedClassUsages.1.java] New instance creation (12: 24) A.T tt = new A.T(1);
+[LibraryNestedClassUsages.1.java] Usage in extends/implements clause (5: 19) class J extends A.T {
+[library.kt] New instance creation (63: 15) val t = A.T(1)
+[library.kt] New instance creation (64: 16) val tt = A.T()
+[library.kt] Supertype (22: 16) class U: A.T {
+[library.kt] Supertype (28: 18) class V(): A.T(1)
+[library.kt] Supertype (34: 17) class UU: A.T {
+[library.kt] Supertype (40: 19) class VV(): A.T()
+[library.kt] Unclassified usage (66: 17) val fff = A.T::bar
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
index 2993b9b..413d5b3 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryObjectUsages.0.kt] Value read 10 val o = O
-[LibraryObjectUsages.1.java] Class static member access 7 O o = O.INSTANCE;
-[LibraryObjectUsages.1.java] Local variable declaration 7 O o = O.INSTANCE;
-[library.kt] Value read 55 val o = O
+[LibraryObjectUsages.0.kt] Value read (10: 13) val o = O
+[LibraryObjectUsages.1.java] Class static member access (7: 15) O o = O.INSTANCE;
+[LibraryObjectUsages.1.java] Local variable declaration (7: 9) O o = O.INSTANCE;
+[library.kt] Value read (55: 13) val o = O
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
index 6dc639a..7622123 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibraryPrimaryConstructorUsages.0.kt] New instance creation 17 val aa = A(1)
-[LibraryPrimaryConstructorUsages.0.kt] Supertype 13 class Y(): A(1)
-[library.kt] New instance creation 57 val a = A(1)
-[library.kt] Supertype 27 class C(): A(1) {
+[LibraryPrimaryConstructorUsages.0.kt] New instance creation (17: 14) val aa = A(1)
+[LibraryPrimaryConstructorUsages.0.kt] Supertype (13: 12) class Y(): A(1)
+[library.kt] New instance creation (57: 13) val a = A(1)
+[library.kt] Supertype (27: 12) class C(): A(1) {
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
index 6b9061b..412d373 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt
@@ -1,4 +1,4 @@
-[LibrarySecondaryConstructorUsages.0.kt] New instance creation 16 val a: A = A()
-[LibrarySecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A()
-[library.kt] New instance creation 58 val aa = A()
-[library.kt] Supertype 39 class CC(): A() {
+[LibrarySecondaryConstructorUsages.0.kt] New instance creation (16: 16) val a: A = A()
+[LibrarySecondaryConstructorUsages.0.kt] Supertype (13: 12) class Y(): A()
+[library.kt] New instance creation (58: 14) val aa = A()
+[library.kt] Supertype (39: 13) class CC(): A() {
\ No newline at end of file
diff --git a/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt b/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
index db2ad32..98cd8cb 100644
--- a/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
+++ b/idea/testData/findUsages/propertyFiles/propertyFileUsages.results.txt
@@ -1,2 +1,2 @@
-Usage in string constants 3 private val BUNDLE_NAME = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0"
-Usage in string constants 5 public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0") key: String) = key
+Usage in string constants (3: 28) private val BUNDLE_NAME = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0"
+Usage in string constants (5: 51) public fun message(@PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyFileUsages.0") key: String) = key
\ No newline at end of file
diff --git a/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt b/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
index 462052f..b2026e88 100644
--- a/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
+++ b/idea/testData/findUsages/propertyFiles/propertyUsages.results.txt
@@ -1,10 +1,10 @@
-[propertyUsages.1.kt] Usage in string constants 16 @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") val s1 = "foo.bar"
-[propertyUsages.1.kt] Usage in string constants 18 message("foo.bar")
-[propertyUsages.1.kt] Usage in string constants 21 "test" infixMessage "foo.bar"
-[propertyUsages.1.kt] Usage in string constants 23 "foo.bar" infixMessage2 "test"
-[propertyUsages.1.kt] Usage in string constants 25 "foo.bar".infixMessage2("test")
-[propertyUsages.1.kt] Usage in string constants 26 -"foo.bar"
-[propertyUsages.1.kt] Usage in string constants 27 1["foo.bar"]
-[propertyUsages.1.kt] Usage in string constants 28 "foo.bar"["test"]
-[propertyUsages.2.java] Usage in string constants 3 @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") String s1 = "foo.bar"
-[propertyUsages.2.java] Usage in string constants 5 PropertyUsages_1Kt.message("foo.bar");
+[propertyUsages.1.kt] Usage in string constants (16: 104) @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") val s1 = "foo.bar"
+[propertyUsages.1.kt] Usage in string constants (18: 14) message("foo.bar")
+[propertyUsages.1.kt] Usage in string constants (21: 26) "test" infixMessage "foo.bar"
+[propertyUsages.1.kt] Usage in string constants (23: 6) "foo.bar" infixMessage2 "test"
+[propertyUsages.1.kt] Usage in string constants (25: 6) "foo.bar".infixMessage2("test")
+[propertyUsages.1.kt] Usage in string constants (26: 7) -"foo.bar"
+[propertyUsages.1.kt] Usage in string constants (27: 8) 1["foo.bar"]
+[propertyUsages.1.kt] Usage in string constants (28: 6) "foo.bar"["test"]
+[propertyUsages.2.java] Usage in string constants (3: 111) @PropertyKey(resourceBundle = "idea.testData.findUsages.propertyFiles.propertyUsages.0") String s1 = "foo.bar"
+[propertyUsages.2.java] Usage in string constants (5: 37) PropertyUsages_1Kt.message("foo.bar");
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
index 7f2259e..fef2d64 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
@@ -28,7 +28,6 @@
import com.intellij.find.impl.FindManagerImpl;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.lang.properties.psi.Property;
-import com.intellij.openapi.editor.markup.TextAttributes;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
@@ -39,7 +38,6 @@
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.usageView.UsageInfo;
-import com.intellij.usages.TextChunk;
import com.intellij.usages.UsageGroup;
import com.intellij.usages.UsageInfo2UsageAdapter;
import com.intellij.usages.UsageViewPresentation;
@@ -51,7 +49,6 @@
import com.intellij.util.CommonProcessors;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
-import org.gradle.util.CollectionUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions;
@@ -70,6 +67,7 @@
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -443,16 +441,10 @@
UsageType usageType = getUsageType(usageAdapter.getElement());
String usageTypeAsString = usageType == null ? "null" : usageType.toString(USAGE_VIEW_PRESENTATION);
- List<TextChunk> usageChunks = new ArrayList<TextChunk>();
- CollectionUtils.addAll(usageChunks, usageAdapter.getPresentation().getText());
-
- // Add space after line number
- usageChunks.add(1, new TextChunk(new TextAttributes(), " "));
-
return (appendFileName ? "[" + usageAdapter.getFile().getName() + "] " : "") +
usageTypeAsString + " " +
groupAsString +
- Joiner.on("").join(usageChunks);
+ Joiner.on("").join(Arrays.asList(usageAdapter.getPresentation().getText()));
}
};
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
index e819df6..838f7b5 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
@@ -16,8 +16,6 @@
package org.jetbrains.kotlin.idea.codeInsight.moveUpDown
-import com.intellij.codeInsight.editorActions.moveLeftRight.MoveElementLeftAction
-import com.intellij.codeInsight.editorActions.moveLeftRight.MoveElementRightAction
import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementDownAction
import com.intellij.codeInsight.editorActions.moveUpDown.MoveStatementUpAction
import com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover
@@ -77,8 +75,6 @@
val action = when (direction) {
"up" -> MoveStatementUpAction()
"down" -> MoveStatementDownAction()
- "left" -> MoveElementLeftAction()
- "right" -> MoveElementRightAction()
else -> error("Unknown direction: $direction")
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveLeftRightTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveLeftRightTestGenerated.java
index 02c34d5..8d95aa5 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveLeftRightTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/MoveLeftRightTestGenerated.java
@@ -25,7 +25,12 @@
import java.io.File;
import java.util.regex.Pattern;
+
+
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+
+/*
+
@SuppressWarnings("all")
@TestMetadata("idea/testData/codeInsight/moveLeftRight")
@TestDataPath("$PROJECT_ROOT")
@@ -119,3 +124,5 @@
doTest(fileName);
}
}
+
+*/
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
index 3e9fbe2..68945a1 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
@@ -236,11 +236,14 @@
return "null"
}
- val virtualFile = sourcePosition.file.originalFile.virtualFile ?: sourcePosition.file.viewProvider.virtualFile ?:
- return "VirtualFile for position is null"
+ val virtualFile = sourcePosition.file.virtualFile
+ if (virtualFile == null) {
+ return "VirtualFile for position is null"
+ }
val libraryEntry = LibraryUtil.findLibraryEntry(virtualFile, project)
- if (libraryEntry != null && (libraryEntry is JdkOrderEntry || libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
+ if (libraryEntry != null && (libraryEntry is JdkOrderEntry ||
+ libraryEntry.presentableName == KOTLIN_LIBRARY_NAME)) {
return FileUtil.getNameWithoutExtension(virtualFile.name) + ".!EXT!"
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
index e6eefad..74cc7e7 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
@@ -470,8 +470,7 @@
val evaluator =
EvaluatorBuilderImpl.build(item,
contextElement,
- sourcePosition,
- project)
+ sourcePosition)
if (evaluator == null) throw AssertionError("Cannot create an Evaluator for Evaluate Expression")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
index d4c806c..53aa4ad 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
index e32ea57..d29c301 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
@@ -142,6 +142,11 @@
}
}
+ @Override
+ protected boolean isRunInWriteAction() {
+ return false;
+ }
+
private void doTestFor(String mainFilePath, Map<String, PsiFile> pathToFiles, final IntentionAction intentionAction, String fileText) throws Exception {
String isApplicableString = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// IS_APPLICABLE: ");
boolean isApplicableExpected = isApplicableString == null || isApplicableString.equals("true");
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
index 1a08833e..cd64820 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
@@ -393,10 +393,4 @@
this.content = content;
}
}
-
- @NotNull
- private VirtualFile findVirtualFile(@NotNull String filePath) {
- String absolutePath = getTestDataPath() + filePath;
- return VfsTestUtil.findFileByCaseSensitivePath(absolutePath);
- }
}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
index 963b848..083e084 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
index 647d89e..2650d7f 100644
--- a/j2k/j2k.iml
+++ b/j2k/j2k.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="intellij-core" level="project" />
<orderEntry type="module" module-name="frontend" />
@@ -18,4 +18,4 @@
<orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
<orderEntry type="module" module-name="tests-common" scope="TEST" />
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/jps-plugin/bare-plugin/bare-plugin.iml b/jps-plugin/bare-plugin/bare-plugin.iml
index 11e5df0..6ea7ccf 100644
--- a/jps-plugin/bare-plugin/bare-plugin.iml
+++ b/jps-plugin/bare-plugin/bare-plugin.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="idea-full" level="project" />
<orderEntry type="module" module-name="jps-plugin" />
diff --git a/jps-plugin/jps-tests/jps-tests.iml b/jps-plugin/jps-tests/jps-tests.iml
index 2f6d942..23bb942 100644
--- a/jps-plugin/jps-tests/jps-tests.iml
+++ b/jps-plugin/jps-tests/jps-tests.iml
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" 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="jps-plugin" scope="TEST" />
<orderEntry type="module" module-name="descriptors" scope="TEST" />
diff --git a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
index 4a98e22..f0eb052 100644
--- a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
+++ b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" 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="jps-tests" />
<orderEntry type="library" scope="TEST" name="jps" level="project" />
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
index 49c145f..21a9702 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log
@@ -1,5 +1,18 @@
================ Step #1 =================
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
+Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
+Cleaning output files:
+ out/production/module4/module4/D.class
+End of files
+Compiling files:
+ module4/src/d.kt
+End of files
+Exit code: OK
+------------------------------------------
Building module1
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
@@ -34,16 +47,3 @@
End of files
Exit code: OK
------------------------------------------
-Building module4
-Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
-Cleaning output files:
- out/production/module4/module4/D.class
-End of files
-Compiling files:
- module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
index aed2ed7..44b7ba6 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log
@@ -1,8 +1,26 @@
================ Step #1 =================
-Building module1
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING]
Cleaning output files:
+ out/production/module4/module4/D.class
+End of files
+Compiling files:
+ module4/src/d.kt
+End of files
+Marked as dirty by Kotlin:
+ module1/src/a.kt
+ module2/src/b.kt
+ module3/src/c.kt
+ module4/src/d.kt
+Exit code: OK
+------------------------------------------
+Building module1
+Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
+Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/module1/A.class
out/production/module1/module1/AKt.class
@@ -10,11 +28,6 @@
Compiling files:
module1/src/a.kt
End of files
-Marked as dirty by Kotlin:
- module1/src/a.kt
- module2/src/b.kt
- module3/src/c.kt
- module4/src/d.kt
Exit code: OK
------------------------------------------
Building module2
@@ -39,16 +52,3 @@
End of files
Exit code: OK
------------------------------------------
-Building module4
-Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
-Cleaning output files:
- out/production/module4/module4/D.class
-End of files
-Compiling files:
- module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
index 24be8877..223a48f 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
@@ -1,5 +1,18 @@
================ Step #1 =================
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
+Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
+Cleaning output files:
+ out/production/module4/module4/D.class
+End of files
+Compiling files:
+ module4/src/d.kt
+End of files
+Exit code: OK
+------------------------------------------
Building module1
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
@@ -19,6 +32,12 @@
================ Step #2 =================
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
+Exit code: NOTHING_DONE
+------------------------------------------
Building module1
Compiling files:
module1/src/a.kt
@@ -48,16 +67,3 @@
End of files
Exit code: OK
------------------------------------------
-Building module4
-Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
-Cleaning output files:
- out/production/module4/module4/D.class
-End of files
-Compiling files:
- module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
index 1f7e6e4..a0865c0 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
@@ -1,8 +1,27 @@
================ Step #1 =================
-Building module1
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING]
Cleaning output files:
+ out/production/module4/module4/D.class
+End of files
+Compiling files:
+ module4/src/d.kt
+End of files
+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
+Exit code: OK
+------------------------------------------
+Building module1
+Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
+Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/module1/A.class
out/production/module1/module1/AKt.class
@@ -12,12 +31,6 @@
module1/src/a.kt
module1/src/f.kt
End of files
-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
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
@@ -25,18 +38,17 @@
================ Step #2 =================
+Building module5
+Exit code: NOTHING_DONE
+------------------------------------------
+Building module4
+Exit code: NOTHING_DONE
+------------------------------------------
Building module1
-Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK]
Compiling files:
module1/src/a.kt
module1/src/f.kt
End of files
-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
Exit code: OK
------------------------------------------
Building module2
@@ -60,17 +72,4 @@
module3/src/c.kt
End of files
Exit code: OK
-------------------------------------------
-Building module4
-Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
-Cleaning output files:
- out/production/module4/module4/D.class
-End of files
-Compiling files:
- module4/src/d.kt
-End of files
-Exit code: OK
-------------------------------------------
-Building module5
-Exit code: NOTHING_DONE
-------------------------------------------
+------------------------------------------
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log
index 60cda59..7906581 100644
--- a/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log
+++ b/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log
@@ -21,14 +21,14 @@
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
+Compiling files:
+ module1/src/D.kt
+End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
@@ -41,15 +41,15 @@
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
+Compiling files:
+ module1/src/A.kt
+ module1/src/D.kt
+End of files
Marked as dirty by Kotlin:
module4/src/E.kt
module5/src/F.kt
diff --git a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log
index 0788779..58be15a 100644
--- a/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log
+++ b/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log
@@ -20,10 +20,10 @@
out/production/module2/b/BKt.class
End of files
Compiling files:
- module1/src/c1.kt
+ module2/src/b.kt
End of files
Compiling files:
- module2/src/b.kt
+ module1/src/c1.kt
End of files
Exit code: OK
------------------------------------------
diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log
index b6d4c85..92b570f 100644
--- a/jps-plugin/testData/incremental/multiModule/twoDependants/build.log
+++ b/jps-plugin/testData/incremental/multiModule/twoDependants/build.log
@@ -11,16 +11,6 @@
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
-------------------------------------------
Building module3
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
@@ -31,3 +21,13 @@
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
+------------------------------------------
diff --git a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log
index 10e8f13..ef61759 100644
--- a/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log
+++ b/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log
@@ -16,16 +16,6 @@
------------------------------------------
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
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
@@ -36,3 +26,13 @@
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
+------------------------------------------
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
index 964b7dd..cb63f56 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log
@@ -19,5 +19,5 @@
End of files
COMPILATION FAILED
cannot find symbol
- symbol: method f(java.lang.String)
- location: class test.FunKt
\ No newline at end of file
+symbol : method f(java.lang.String)
+location: class test.FunKt
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
index 4012e16..c1d7468 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log
@@ -17,5 +17,4 @@
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
+y() in Sub cannot override y() in Super; overridden method is final
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
index b4add23..938f61c 100644
--- a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log
@@ -19,5 +19,5 @@
End of files
COMPILATION FAILED
cannot find symbol
- symbol: method getProp()
- location: class test.PropKt
\ No newline at end of file
+symbol : method getProp()
+location: class test.PropKt
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index 5a34648..c5a9b78 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" 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="Rhino" level="project" />
<orderEntry type="module" module-name="js.translator" />
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 247f37f..98619cf 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.jetbrains.kotlin.gradle.plugin
import com.android.build.gradle.BaseExtension
@@ -681,4 +697,4 @@
}
return 0
}
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
index e5b9dd2..e7bfeda 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.util.getFileByName
@@ -161,4 +177,4 @@
assertSuccessful()
}
}
-}
\ No newline at end of file
+}
diff --git a/non-compiler-tests/non-compiler-tests.iml b/non-compiler-tests/non-compiler-tests.iml
index 267c8cf..e1bec21 100644
--- a/non-compiler-tests/non-compiler-tests.iml
+++ b/non-compiler-tests/non-compiler-tests.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="module" module-name="idea" scope="TEST" />
<orderEntry type="module" module-name="tests-common" scope="TEST" />
diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
index ae6a9ef..813541e 100644
--- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
+++ b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.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="android-extensions-compiler" exported="" />
<orderEntry type="module" module-name="idea-android" />
diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
index af0c7dd..7f5bdb0 100644
--- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
+++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/res/IDEAndroidLayoutXmlFileManager.kt
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.android.synthetic.idea.res
import com.android.builder.model.SourceProvider
-import com.android.tools.idea.gradle.AndroidGradleModel
import com.intellij.openapi.module.Module
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
@@ -112,22 +111,27 @@
val applicationPackage = manifest?.`package`?.toString()
if (applicationPackage != null) {
+ // This code is needed for compatibility with AS 2.0 and IDEA 15.0, because of difference in android plugins
+ val modelClass = try {
+ Class.forName("com.android.tools.idea.gradle.AndroidGradleModel")
+ }
+ catch(e: ClassNotFoundException) {
+ null
+ }
val mainVariant = mainSourceProvider.toVariant()
-
- val method = try { javaClass.getMethod("getFlavorSourceProviders") } catch (e: NoSuchMethodException) { null }
- val variants: List<AndroidVariant>? = if (method != null) {
- val sourceProviders = method.invoke(this) as List<SourceProvider>?
- sourceProviders?.map { it.toVariant() } ?: listOf()
+ if (modelClass == null) {
+ val flavorVariants = flavorSourceProviders?.map { it.toVariant() } ?: listOf()
+ return AndroidModule(applicationPackage, listOf(mainVariant) + flavorVariants)
}
else {
- val model = AndroidGradleModel.get(module)
- model?.flavorSourceProviders?.map { it.toVariant() } ?: listOf(this.mainSourceProvider.toVariant())
- }
-
- if (variants != null) {
- return AndroidModule(applicationPackage, listOf(mainVariant) + variants)
+ val model = modelClass.getDeclaredMethod("get", Module::class.java).invoke(null, module)
+ if (model != null) {
+ val sourceProviders = modelClass.getDeclaredMethod("getFlavorSourceProviders").invoke(model) as List<SourceProvider>
+ return AndroidModule(applicationPackage, listOf(mainVariant) + sourceProviders.map { it.toVariant() })
+ }
}
}
return null
}
+
}
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
index 1a65771..6cc37cb 100644
--- a/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+++ b/plugins/android-extensions/android-extensions-idea/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
@@ -213,15 +213,15 @@
public void tearDown() throws Exception {
KotlinInternalMode.Instance.setEnabled(kotlinInternalModeOriginalValue);
- Field listenersField = PsiProjectListener.class.getDeclaredField("myListeners");
+ super.tearDown();
+
+ Field listenersField = PsiProjectListener.class.getDeclaredField("ourListeners");
listenersField.setAccessible(true);
- Map listeners = (Map)listenersField.get(PsiProjectListener.getInstance(getProject()));
+ Map listeners = (Map)listenersField.get(null);
listeners.clear();
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory());
- super.tearDown();
-
myModule = null;
myAdditionalModules = null;
myFixture.tearDown();
diff --git a/plugins/lint/lint-checks/lint-checks.iml b/plugins/lint/lint-checks/lint-checks.iml
index 2297ebf..effe887 100644
--- a/plugins/lint/lint-checks/lint-checks.iml
+++ b/plugins/lint/lint-checks/lint-checks.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="android-annotations" />
<orderEntry type="module" module-name="lint-api" />
diff --git a/plugins/lint/lint-idea/lint-idea.iml b/plugins/lint/lint-idea/lint-idea.iml
index 7e41a5f..1b6a879 100644
--- a/plugins/lint/lint-idea/lint-idea.iml
+++ b/plugins/lint/lint-idea/lint-idea.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="lint-api" />
<orderEntry type="module" module-name="lint-checks" />
diff --git a/plugins/plugins-tests/plugins-tests.iml b/plugins/plugins-tests/plugins-tests.iml
index a8854bd3..bd14234 100644
--- a/plugins/plugins-tests/plugins-tests.iml
+++ b/plugins/plugins-tests/plugins-tests.iml
@@ -5,7 +5,7 @@
<content url="file://$MODULE_DIR$">
<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="android-extensions-compiler" />
<orderEntry type="module" module-name="android-extensions-jps" />
diff --git a/plugins/uast-kotlin/uast-kotlin.iml b/plugins/uast-kotlin/uast-kotlin.iml
index 5935f4b..8a32eab 100644
--- a/plugins/uast-kotlin/uast-kotlin.iml
+++ b/plugins/uast-kotlin/uast-kotlin.iml
@@ -6,7 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" 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="kotlin-runtime" level="project" />
<orderEntry type="library" name="idea-full" level="project" />
diff --git a/ultimate/resources/META-INF/kotlin-spring.xml b/ultimate/resources/META-INF/kotlin-spring.xml
index 62345c3..2c572ea 100644
--- a/ultimate/resources/META-INF/kotlin-spring.xml
+++ b/ultimate/resources/META-INF/kotlin-spring.xml
@@ -12,7 +12,6 @@
<multiHostInjector implementation="org.jetbrains.kotlin.idea.spring.el.KotlinSpringELInjector"/>
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.spring.lineMarking.KotlinSpringClassAnnotator"/>
- <codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.spring.lineMarking.KotlinSpringModelDependenciesLineMarkerProvider"/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.spring.inspections.KotlinFinalClassOrFunSpringInspection"
displayName="Final Kotlin class or function with Spring annotation"
diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt
index ee5838e..ac3ba6e 100644
--- a/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt
+++ b/ultimate/src/org/jetbrains/kotlin/idea/spring/lineMarking/KotlinSpringModelDependenciesLineMarkerProvider.kt
@@ -16,6 +16,8 @@
package org.jetbrains.kotlin.idea.spring.lineMarking
+/*
+
import com.intellij.codeHighlighting.Pass
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
import com.intellij.codeInsight.daemon.LineMarkerInfo
@@ -38,6 +40,7 @@
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch
+
class KotlinSpringModelDependenciesLineMarkerProvider : ModelDependenciesLineMarkerProviderJava() {
override fun getId() = javaClass.name
@@ -80,4 +83,5 @@
.show(RelativePoint(event))
}
}
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/ultimate/testData/spring/core/findUsages/classXml.results.txt b/ultimate/testData/spring/core/findUsages/classXml.results.txt
index 3044667..a7c958f 100644
--- a/ultimate/testData/spring/core/findUsages/classXml.results.txt
+++ b/ultimate/testData/spring/core/findUsages/classXml.results.txt
@@ -1 +1 @@
-Usage in XML descriptor 5 <bean class="a.KotlinSpringBean" name="xmlKotlinBean"/>
\ No newline at end of file
+Usage in XML descriptor (5: 20) <bean class="a.KotlinSpringBean" name="xmlKotlinBean"/>
\ No newline at end of file
diff --git a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt b/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt
index 7a3c68f..427d260 100644
--- a/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt
+++ b/ultimate/testData/spring/core/findUsages/primaryConstructorArgXml.results.txt
@@ -1,2 +1,2 @@
-Usage in XML descriptor 6 <constructor-arg name="value" value="2"/>
-Usage in XML descriptor 7 <property name="value"/>
\ No newline at end of file
+Usage in XML descriptor (6: 32) <constructor-arg name="value" value="2"/>
+Usage in XML descriptor (7: 25) <property name="value"/>
\ No newline at end of file
diff --git a/ultimate/testData/spring/core/findUsages/propertyXml.results.txt b/ultimate/testData/spring/core/findUsages/propertyXml.results.txt
index af8e138..e5d951a 100644
--- a/ultimate/testData/spring/core/findUsages/propertyXml.results.txt
+++ b/ultimate/testData/spring/core/findUsages/propertyXml.results.txt
@@ -1 +1 @@
-Usage in XML descriptor 6 <property name="foo"/>
\ No newline at end of file
+Usage in XML descriptor (6: 25) <property name="foo"/>
\ No newline at end of file
diff --git a/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt b/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt
index 92fc23a..352c9ed 100644
--- a/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt
+++ b/ultimate/testData/spring/core/findUsages/setterFunXml.results.txt
@@ -1 +1 @@
-Usage in XML descriptor 6 <property name="bar"/>
\ No newline at end of file
+Usage in XML descriptor (6: 25) <property name="bar"/>
\ No newline at end of file
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 9a9fd5b..38340be 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,7 +1,7 @@
<project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
<property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
- <property name="ideaVersion" value="2016.1.2"/>
+ <property name="ideaVersion" value="143.2287.1"/>
<property name="idea.kotlin.branch" value="rc"/>
@@ -674,7 +674,7 @@
<file file="@{idea.dir}/lib/jdom.jar"/>
<file file="@{idea.dir}/lib/jna.jar"/>
<file file="@{idea.dir}/lib/log4j.jar"/>
- <file file="@{idea.dir}/lib/xstream-1.4.8.jar"/>
+ <file file="@{idea.dir}/lib/xstream-1.4.3.jar"/>
<file file="@{idea.dir}/lib/xpp3-1.1.4-min.jar"/>
<file file="@{idea.dir}/lib/jsr166e.jar"/>
<file file="@{idea.dir}/lib/asm-all.jar"/>
