diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 0fd8395d19c..03c1dd857ce 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -464,16 +464,18 @@ + - - - - + diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.kt index b689c683410..2f41b8c59a6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.kt +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.kt @@ -17,10 +17,12 @@ package org.jetbrains.kotlin.idea.presentation import com.intellij.navigation.ColoredItemPresentation +import com.intellij.navigation.ItemPresentationProvider import com.intellij.openapi.editor.colors.CodeInsightColors import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.util.Iconable import org.jetbrains.kotlin.idea.KotlinIconProvider +import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtPsiUtil @@ -37,9 +39,22 @@ open class KotlinDefaultNamedDeclarationPresentation(private val declaration: Kt override fun getLocationString(): String? { val name = declaration.fqName ?: return null - return "(" + name.parent().asString() + ")" + val receiverTypeRef = (declaration as? KtCallableDeclaration)?.receiverTypeReference + if (receiverTypeRef != null) { + return "(for " + receiverTypeRef.text + " in " + name.parent() + ")" + } + else if (declaration.parent is KtFile) { + return "(" + name.parent() + ")" + } + else { + return "(in " + name.parent() + ")" + } } override fun getIcon(unused: Boolean) = KotlinIconProvider.INSTANCE.getIcon(declaration, Iconable.ICON_FLAG_VISIBILITY or Iconable.ICON_FLAG_READ_STATUS) } + +class KtDefaultDeclarationPresenter : ItemPresentationProvider { + override fun getPresentation(item: KtNamedDeclaration) = KotlinDefaultNamedDeclarationPresentation(item) +} diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.kt deleted file mode 100644 index ca6b8521a5d..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2015 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.idea.presentation - -import com.intellij.navigation.ItemPresentationProvider -import org.jetbrains.kotlin.psi.KtClass - -class KtClassPresenter : ItemPresentationProvider { - override fun getPresentation(item: KtClass) = KotlinDefaultNamedDeclarationPresentation(item) -} diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt index f1229a1c370..c8e273645d7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.kt @@ -43,10 +43,7 @@ class KtFunctionPresenter : ItemPresentationProvider { return "(in $name)" } - val name = function.fqName ?: return null - val receiverTypeRef = function.receiverTypeReference - val extensionLocation = if (receiverTypeRef != null) "for " + receiverTypeRef.text + " " else "" - return "(${extensionLocation}in ${name.parent()})" + return super.getLocationString() } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt deleted file mode 100644 index bc298a68eb9..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2015 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.idea.presentation - -import com.intellij.navigation.ItemPresentationProvider -import org.jetbrains.kotlin.psi.KtObjectDeclaration - -class KtObjectPresenter : ItemPresentationProvider { - override fun getPresentation(item: KtObjectDeclaration) = KotlinDefaultNamedDeclarationPresentation(item) -} diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt deleted file mode 100644 index c02c24b0a74..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2015 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.idea.presentation - -import com.intellij.navigation.ItemPresentationProvider -import org.jetbrains.kotlin.psi.KtParameter - -class KtParameterPresenter : ItemPresentationProvider { - override fun getPresentation(item: KtParameter) = KotlinDefaultNamedDeclarationPresentation(item) -} diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt b/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt deleted file mode 100644 index 185dc51a35c..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2015 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.idea.presentation - -import com.intellij.navigation.ItemPresentationProvider -import org.jetbrains.kotlin.psi.KtProperty - -class KtPropertyPresenter : ItemPresentationProvider { - override fun getPresentation(item: KtProperty) = KotlinDefaultNamedDeclarationPresentation(item) -} diff --git a/idea/testData/kdoc/resolve/CodeReference.kt b/idea/testData/kdoc/resolve/CodeReference.kt index 7b3f8833ee2..72fc35d8c58 100644 --- a/idea/testData/kdoc/resolve/CodeReference.kt +++ b/idea/testData/kdoc/resolve/CodeReference.kt @@ -5,4 +5,4 @@ fun foo() {} fun bar() {} -// REF: (in ).bar() +// REF: ().bar() diff --git a/idea/testData/navigation/gotoClass/inClassObject.kt b/idea/testData/navigation/gotoClass/inClassObject.kt index f5cd2df42c8..c55c7401ef4 100644 --- a/idea/testData/navigation/gotoClass/inClassObject.kt +++ b/idea/testData/navigation/gotoClass/inClassObject.kt @@ -15,7 +15,7 @@ class InClassObject { } // SEARCH_TEXT: ClassObject -// REF: (test.InClassObject.Companion).ClassObjectClass -// REF: (test.InClassObject.Companion).ClassObjectObject -// REF: (test.InClassObject.Companion).ClassObjectTrait -// REF: (test.InClassObject.Companion).ClassObjectTraitWithImpl \ No newline at end of file +// REF: (in test.InClassObject.Companion).ClassObjectClass +// REF: (in test.InClassObject.Companion).ClassObjectObject +// REF: (in test.InClassObject.Companion).ClassObjectTrait +// REF: (in test.InClassObject.Companion).ClassObjectTraitWithImpl \ No newline at end of file diff --git a/idea/testData/navigation/gotoClass/innerClass.kt b/idea/testData/navigation/gotoClass/innerClass.kt index 0879628e87d..c68f816a536 100644 --- a/idea/testData/navigation/gotoClass/innerClass.kt +++ b/idea/testData/navigation/gotoClass/innerClass.kt @@ -7,4 +7,4 @@ class A { } // SEARCH_TEXT: Inner -// REF: (small.A).InnerA \ No newline at end of file +// REF: (in small.A).InnerA \ No newline at end of file diff --git a/idea/testData/navigation/gotoSymbol/functions.kt b/idea/testData/navigation/gotoSymbol/functions.kt index 50953703f0f..07f5a183852 100644 --- a/idea/testData/navigation/gotoSymbol/functions.kt +++ b/idea/testData/navigation/gotoSymbol/functions.kt @@ -6,7 +6,7 @@ class Some { } // SEARCH_TEXT: test -// REF: (in ).testFunction() +// REF: ().testFunction() // REF: (in Some).testFunInClass() diff --git a/idea/testData/navigation/gotoSymbol/properties.kt b/idea/testData/navigation/gotoSymbol/properties.kt index 7c8aa0f3844..b0bf66d93bc 100644 --- a/idea/testData/navigation/gotoSymbol/properties.kt +++ b/idea/testData/navigation/gotoSymbol/properties.kt @@ -18,6 +18,6 @@ class Some() { // SEARCH_TEXT: test // REF: ().testGlobal -// REF: (Some).testInClass -// REF: (Some.Companion).testInClassObject -// REF: (SomeTrait).testInTrait \ No newline at end of file +// REF: (in Some).testInClass +// REF: (in Some.Companion).testInClassObject +// REF: (in SomeTrait).testInTrait \ No newline at end of file diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt index 3a0ed62dbf6..5430ccde775 100644 --- a/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt +++ b/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt @@ -1,4 +1,4 @@ // RUNTIME_WITH_SOURCES // CHECK_BOX // SEARCH_TEXT: arrayListOf -// REF: (in kotlin).arrayListOf(T) +// REF: (kotlin).arrayListOf(T) diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt index e21649c2c01..89d9c54a26f 100644 --- a/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt +++ b/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt @@ -1,4 +1,4 @@ // RUNTIME // CHECK_BOX // SEARCH_TEXT: arrayListOf -// REF: (in kotlin).arrayListOf(T) +// REF: (kotlin).arrayListOf(T) diff --git a/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt b/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt index 11861f0a938..ca6f86b67b2 100644 --- a/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt +++ b/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt @@ -1,25 +1,25 @@ // RUNTIME_WITH_SOURCES // CHECK_BOX // SEARCH_TEXT: joinToString -// REF: (for Array in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?) -// REF: (for Array in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?) -// REF: (for BooleanArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Boolean) -> CharSequence)?) -// REF: (for BooleanArray in kotlin).joinToString(String,String,String,Int,String,((Boolean) -> String)?) -// REF: (for ByteArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Byte) -> CharSequence)?) -// REF: (for ByteArray in kotlin).joinToString(String,String,String,Int,String,((Byte) -> String)?) -// REF: (for CharArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Char) -> CharSequence)?) -// REF: (for CharArray in kotlin).joinToString(String,String,String,Int,String,((Char) -> String)?) -// REF: (for DoubleArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Double) -> CharSequence)?) -// REF: (for DoubleArray in kotlin).joinToString(String,String,String,Int,String,((Double) -> String)?) -// REF: (for FloatArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Float) -> CharSequence)?) -// REF: (for FloatArray in kotlin).joinToString(String,String,String,Int,String,((Float) -> String)?) -// REF: (for IntArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Int) -> CharSequence)?) -// REF: (for IntArray in kotlin).joinToString(String,String,String,Int,String,((Int) -> String)?) -// REF: (for Iterable in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?) -// REF: (for Iterable in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?) -// REF: (for LongArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Long) -> CharSequence)?) -// REF: (for LongArray in kotlin).joinToString(String,String,String,Int,String,((Long) -> String)?) -// REF: (for Sequence in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((T) -> CharSequence)?) -// REF: (for Sequence in kotlin).joinToString(String,String,String,Int,String,((T) -> String)?) -// REF: (for ShortArray in kotlin).joinToString(CharSequence,CharSequence,CharSequence,Int,CharSequence,((Short) -> CharSequence)?) -// REF: (for ShortArray in kotlin).joinToString(String,String,String,Int,String,((Short) -> String)?) \ No newline at end of file +// REF: (for Array in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Array in kotlin).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for BooleanArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Boolean) -> CharSequence)?) +// REF: (for BooleanArray in kotlin).joinToString(String, String, String, Int, String, ((Boolean) -> String)?) +// REF: (for ByteArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Byte) -> CharSequence)?) +// REF: (for ByteArray in kotlin).joinToString(String, String, String, Int, String, ((Byte) -> String)?) +// REF: (for CharArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Char) -> CharSequence)?) +// REF: (for CharArray in kotlin).joinToString(String, String, String, Int, String, ((Char) -> String)?) +// REF: (for DoubleArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Double) -> CharSequence)?) +// REF: (for DoubleArray in kotlin).joinToString(String, String, String, Int, String, ((Double) -> String)?) +// REF: (for FloatArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Float) -> CharSequence)?) +// REF: (for FloatArray in kotlin).joinToString(String, String, String, Int, String, ((Float) -> String)?) +// REF: (for IntArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Int) -> CharSequence)?) +// REF: (for IntArray in kotlin).joinToString(String, String, String, Int, String, ((Int) -> String)?) +// REF: (for Iterable in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Iterable in kotlin).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for LongArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Long) -> CharSequence)?) +// REF: (for LongArray in kotlin).joinToString(String, String, String, Int, String, ((Long) -> String)?) +// REF: (for Sequence in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Sequence in kotlin).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for ShortArray in kotlin).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Short) -> CharSequence)?) +// REF: (for ShortArray in kotlin).joinToString(String, String, String, Int, String, ((Short) -> String)?) \ No newline at end of file diff --git a/idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt b/idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt index a7b04f331b2..d669480657a 100644 --- a/idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt +++ b/idea/testData/navigation/implementations/ConstructorPropertyOverriddenNavigation.kt @@ -8,5 +8,5 @@ class OtherTestInBody(some: Int, other: String): Test(some) { override var some: Int = some } -// REF: (testing.OtherTestInConstructor).some -// REF: (testing.OtherTestInBody).some \ No newline at end of file +// REF: (in testing.OtherTestInConstructor).some +// REF: (in testing.OtherTestInBody).some \ No newline at end of file diff --git a/idea/testData/navigation/implementations/EnumEntriesInheritance.kt b/idea/testData/navigation/implementations/EnumEntriesInheritance.kt index e39275f5f83..bac060fc9ab 100644 --- a/idea/testData/navigation/implementations/EnumEntriesInheritance.kt +++ b/idea/testData/navigation/implementations/EnumEntriesInheritance.kt @@ -12,5 +12,5 @@ enum class E { open fun foo(n: Int): Int = n } -// REF: (E).A -// REF: (E).B \ No newline at end of file +// REF: (in E).A +// REF: (in E).B \ No newline at end of file diff --git a/idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt b/idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt index 75439f2c22b..f2c24ffe438 100644 --- a/idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt +++ b/idea/testData/navigation/implementations/ImplementGenericWithPrimitives.kt @@ -43,11 +43,11 @@ class NoOverride: Foo() { override fun bar(t: Any, u: String): String = "" } -// REF: "(in AllTypes).bar(Int,Double)" -// REF: "(in NoPrimitives).bar(String,Any)" -// REF: "(in ParameterStillGeneric).bar(Int,Z)" -// REF: "(in ReturnStillGeneric).bar(Int,Int)" -// REF: "(in ReturnType).bar(Any,String)" -// REF: "(in SomeParameters).bar(Double,Any)" -// REF: "(in ThroughProxyAllGenericsImpl).bar(Double,Int)" -// REF: "(in ThroughProxySomeGenericsImpl).bar(Double,Int)" +// REF: "(in AllTypes).bar(Int, Double)" +// REF: "(in NoPrimitives).bar(String, Any)" +// REF: "(in ParameterStillGeneric).bar(Int, Z)" +// REF: "(in ReturnStillGeneric).bar(Int, Int)" +// REF: "(in ReturnType).bar(Any, String)" +// REF: "(in SomeParameters).bar(Double, Any)" +// REF: "(in ThroughProxyAllGenericsImpl).bar(Double, Int)" +// REF: "(in ThroughProxySomeGenericsImpl).bar(Double, Int)" diff --git a/idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt b/idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt index 31ed7520492..3cdfdb317e3 100644 --- a/idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt +++ b/idea/testData/navigation/implementations/PropertyOverriddenNavigation.kt @@ -13,5 +13,5 @@ class SubSubBase: SubBase() { } -// REF: (testing.SubBase).test -// REF: (testing.SubSubBase).test \ No newline at end of file +// REF: (in testing.SubBase).test +// REF: (in testing.SubSubBase).test \ No newline at end of file diff --git a/idea/testData/resolve/referenceInJava/AnnotationParameterReference.java b/idea/testData/resolve/referenceInJava/AnnotationParameterReference.java index ae604aa6e9b..f44e393b655 100644 --- a/idea/testData/resolve/referenceInJava/AnnotationParameterReference.java +++ b/idea/testData/resolve/referenceInJava/AnnotationParameterReference.java @@ -2,4 +2,4 @@ public class Class { } -// REF: (k.KAnno).d +// REF: (in k.KAnno).d diff --git a/idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java b/idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java index d358c2d098f..37a47ca3ce7 100644 --- a/idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java +++ b/idea/testData/resolve/referenceInJava/AutoGeneratedOverloads.java @@ -4,4 +4,4 @@ public class AutoGeneratedOverloads { } } -// REF: (in k).withJvmOverloads(Int,Boolean,String) +// REF: (k).withJvmOverloads(Int, Boolean, String) diff --git a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java index ab85aad25ee..9310335e9cf 100644 --- a/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java +++ b/idea/testData/resolve/referenceInJava/ClassObjectStaticField.java @@ -6,4 +6,4 @@ public class ClassObjectField { } } -// REF: (k.StaticFieldInClassObjectInTrait.Companion).XX \ No newline at end of file +// REF: (in k.StaticFieldInClassObjectInTrait.Companion).XX \ No newline at end of file diff --git a/idea/testData/resolve/referenceInJava/EnumEntry.java b/idea/testData/resolve/referenceInJava/EnumEntry.java index 9ba5a1de0b8..1e694954fe7 100644 --- a/idea/testData/resolve/referenceInJava/EnumEntry.java +++ b/idea/testData/resolve/referenceInJava/EnumEntry.java @@ -4,4 +4,4 @@ public class EnumEntry { } } -// REF: (k.EnumClass).ENTRY +// REF: (in k.EnumClass).ENTRY diff --git a/idea/testData/resolve/referenceInJava/Getter.java b/idea/testData/resolve/referenceInJava/Getter.java index bb6e7d883bc..ca92fde5562 100644 --- a/idea/testData/resolve/referenceInJava/Getter.java +++ b/idea/testData/resolve/referenceInJava/Getter.java @@ -4,4 +4,4 @@ public class Getter { } } -// REF: (k.Class).prop +// REF: (in k.Class).prop diff --git a/idea/testData/resolve/referenceInLib/toLocalFun.kt b/idea/testData/resolve/referenceInLib/toLocalFun.kt index 95854d827ba..2d3a085344a 100644 --- a/idea/testData/resolve/referenceInLib/toLocalFun.kt +++ b/idea/testData/resolve/referenceInLib/toLocalFun.kt @@ -5,4 +5,4 @@ val tl = topLevel() // CONTEXT: return local() // WITH_LIBRARY: /resolve/referenceInLib/inLibrarySource -// REF: .local() \ No newline at end of file +// REF: local() \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt b/idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt index 611bed9d9c8..efa7ee41598 100644 --- a/idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt +++ b/idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt @@ -9,5 +9,5 @@ class B { } // MULTIRESOLVE -// REF: (for T in dependency).getValue(R,kotlin.reflect.KProperty<*>) -// REF: (for T in dependency).setValue(R,kotlin.reflect.KProperty<*>,kotlin.Int) +// REF: (for T in dependency).getValue(R, kotlin.reflect.KProperty<*>) +// REF: (for T in dependency).setValue(R, kotlin.reflect.KProperty<*>, kotlin.Int) diff --git a/idea/testData/resolve/referenceWithLib/innerClassFromLib.kt b/idea/testData/resolve/referenceWithLib/innerClassFromLib.kt index 957bf6cfcf5..dd09d1821c4 100644 --- a/idea/testData/resolve/referenceWithLib/innerClassFromLib.kt +++ b/idea/testData/resolve/referenceWithLib/innerClassFromLib.kt @@ -4,4 +4,4 @@ import dependency.* val a: Outer.Inner? = null -// REF: (dependency.Outer).Inner \ No newline at end of file +// REF: (in dependency.Outer).Inner \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt b/idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt index f79195f902d..25e8cc668d4 100644 --- a/idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt +++ b/idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt @@ -4,4 +4,4 @@ import dependency.* val a: Outer.Nested? = null -// REF: (dependency.Outer).Nested \ No newline at end of file +// REF: (in dependency.Outer).Nested \ No newline at end of file diff --git a/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt b/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt index 157bf1865ca..45a03143589 100644 --- a/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt +++ b/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt @@ -6,4 +6,4 @@ fun foo(a: List) { a["bar"] = 3 } -// REF: (for kotlin.List in dependency).set(kotlin.String,T) +// REF: (for kotlin.List in dependency).set(kotlin.String, T) diff --git a/idea/testData/resolve/references/AnnotationOnFile.kt b/idea/testData/resolve/references/AnnotationOnFile.kt index ad8ff9b21b8..491f48d1035 100644 --- a/idea/testData/resolve/references/AnnotationOnFile.kt +++ b/idea/testData/resolve/references/AnnotationOnFile.kt @@ -2,4 +2,4 @@ package foo -// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith,kotlin.DeprecationLevel) +// REF: (in kotlin.Deprecated).Deprecated(kotlin.String, kotlin.ReplaceWith, kotlin.DeprecationLevel) diff --git a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt index a9c0117d3ed..8497c5dc2e5 100644 --- a/idea/testData/resolve/references/AnnotationOnFileWithImport.kt +++ b/idea/testData/resolve/references/AnnotationOnFileWithImport.kt @@ -4,4 +4,4 @@ package foo import kotlin.Deprecated as D -// REF: (in kotlin.Deprecated).Deprecated(kotlin.String,kotlin.ReplaceWith,kotlin.DeprecationLevel) +// REF: (in kotlin.Deprecated).Deprecated(kotlin.String, kotlin.ReplaceWith, kotlin.DeprecationLevel) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt index 385b6b9c8a8..94c7a250a24 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt @@ -4,5 +4,5 @@ class Foo fun Foo.getValue(_this: Any?, p: Any?): Int = 1 -// REF: (for Foo in ).getValue(Any?,Any?) +// REF: (for Foo in ).getValue(Any?, Any?) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt index bfcddb494f5..e074e1a5fd3 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt @@ -4,5 +4,5 @@ class Foo { fun getValue(_this: Any?, p: Any?): Int = 1 } -// REF: (in Foo).getValue(Any?,Any?) +// REF: (in Foo).getValue(Any?, Any?) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt index 4e1c44b0fbc..8c0fe7a2657 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt @@ -15,6 +15,6 @@ interface Zoo { class Baz: Foo, Bar, Zoo // MULTIRESOLVE -// REF: (in Bar).getValue(Any?,Any?) -// REF: (in Foo).getValue(Any?,Any?) -// REF: (in Zoo).setValue(Any?,Any?,Any?) +// REF: (in Bar).getValue(Any?, Any?) +// REF: (in Foo).getValue(Any?, Any?) +// REF: (in Zoo).setValue(Any?, Any?, Any?) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt index 30c79f5cdf3..6123017e9ee 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt @@ -6,4 +6,4 @@ interface Foo { class Baz: Foo -// REF: (in Foo).getValue(Any?,Any?) \ No newline at end of file +// REF: (in Foo).getValue(Any?, Any?) \ No newline at end of file diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt index ea59155c013..7fe10c34640 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedExtension.kt @@ -7,7 +7,7 @@ fun Foo.setValue(_this: Any?, p: Any?, val: Any?) {} fun Foo.propertyDelegated(p: Any?) {} // MULTIRESOLVE -// REF: (for Foo in ).getValue(Any?,Any?) -// REF: (for Foo in ).setValue(Any?,Any?,Any?) +// REF: (for Foo in ).getValue(Any?, Any?) +// REF: (for Foo in ).setValue(Any?, Any?, Any?) // REF: (for Foo in ).propertyDelegated(Any?) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt index a014579da5e..0be8aa638b6 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetPropertyDelegatedMember.kt @@ -7,7 +7,7 @@ class Foo { } // MULTIRESOLVE -// REF: (in Foo).getValue(Any?,Any?) -// REF: (in Foo).setValue(Any?,Any?,Any?) +// REF: (in Foo).getValue(Any?, Any?) +// REF: (in Foo).setValue(Any?, Any?, Any?) // REF: (in Foo).propertyDelegated(Any?) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt index c8e9b6fb57c..eb8af609d3d 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt @@ -1,3 +1,3 @@ val x: Int by lazy {1} -// REF: (for kotlin.Lazy in kotlin).getValue(kotlin.Any?,kotlin.reflect.KProperty<*>) +// REF: (for kotlin.Lazy in kotlin).getValue(kotlin.Any?, kotlin.reflect.KProperty<*>) diff --git a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt index 662a7bbbe5f..f396fd7bd65 100644 --- a/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt +++ b/idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt @@ -3,5 +3,5 @@ import kotlin.properties.Delegates var x: Int by Delegates.notNull() // MULTIRESOLVE -// REF: (in kotlin.properties.ReadWriteProperty).getValue(R,kotlin.reflect.KProperty<*>) -// REF: (in kotlin.properties.ReadWriteProperty).setValue(R,kotlin.reflect.KProperty<*>,T) +// REF: (in kotlin.properties.ReadWriteProperty).getValue(R, kotlin.reflect.KProperty<*>) +// REF: (in kotlin.properties.ReadWriteProperty).setValue(R, kotlin.reflect.KProperty<*>, T)