diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt index f271858f0fe..d1027d7f1d3 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt @@ -1,4 +1,4 @@ -import kotlin.support.AbstractIterator +import kotlin.collections.AbstractIterator class MyIterator : AbstractIterator() { var i = 0 diff --git a/compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt b/compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt index dd3315896ec..a425a2b416c 100644 --- a/compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt @@ -1,5 +1,3 @@ -import kotlin.support.* - interface Stream { fun iterator(): Iterator } diff --git a/idea/idea-completion/testData/basic/common/PreferLessParameters.kt b/idea/idea-completion/testData/basic/common/PreferLessParameters.kt index 1bc55338ea2..563d5a2a694 100644 --- a/idea/idea-completion/testData/basic/common/PreferLessParameters.kt +++ b/idea/idea-completion/testData/basic/common/PreferLessParameters.kt @@ -3,8 +3,8 @@ fun foo(iterable: Iterable) { } // WITH_ORDER -// EXIST: { itemText: "single", tailText: "() for Iterable in kotlin" } -// EXIST: { itemText: "single", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin" } -// EXIST: { itemText: "singleOrNull", tailText: "() for Iterable in kotlin" } -// EXIST: { itemText: "singleOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin" } +// EXIST: { itemText: "single", tailText: "() for Iterable in kotlin.collections" } +// EXIST: { itemText: "single", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin.collections" } +// EXIST: { itemText: "singleOrNull", tailText: "() for Iterable in kotlin.collections" } +// EXIST: { itemText: "singleOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin.collections" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt b/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt index 576d20cb4c3..5e873edb655 100644 --- a/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt +++ b/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesFilter.kt @@ -2,6 +2,6 @@ fun test(p1: (String) -> Boolean, p2: (Int) -> Boolean) { listOf("a", "b").filt } -// EXIST: { itemText: "filter", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin", typeText:"List" } -// EXIST: { itemText: "filter", tailText: "(p1) for Iterable in kotlin", typeText: "List" } -// ABSENT: { itemText: "filter", tailText: "(p2) for Iterable in kotlin", typeText: "List" } +// EXIST: { itemText: "filter", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin.collections", typeText:"List" } +// EXIST: { itemText: "filter", tailText: "(p1) for Iterable in kotlin.collections", typeText: "List" } +// ABSENT: { itemText: "filter", tailText: "(p2) for Iterable in kotlin.collections", typeText: "List" } diff --git a/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt b/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt index 0ad76c81200..be85629d52f 100644 --- a/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt +++ b/idea/idea-completion/testData/basic/common/highOrderFunctions/ContextVariablesMap.kt @@ -2,7 +2,7 @@ fun test(p1: (String) -> Int, p2: (Int) -> Int, p3: (String) -> Char) { listOf("a", "b").map } -// EXIST: { itemText: "map", tailText: " {...} (transform: (String) -> R) for Iterable in kotlin", typeText:"List" } -// EXIST: { itemText: "map", tailText: "(p1) for Iterable in kotlin", typeText: "List" } -// ABSENT: { itemText: "map", tailText: "(p2) for Iterable in kotlin", typeText: "List" } -// EXIST: { itemText: "map", tailText: "(p3) for Iterable in kotlin", typeText: "List" } +// EXIST: { itemText: "map", tailText: " {...} (transform: (String) -> R) for Iterable in kotlin.collections", typeText:"List" } +// EXIST: { itemText: "map", tailText: "(p1) for Iterable in kotlin.collections", typeText: "List" } +// ABSENT: { itemText: "map", tailText: "(p2) for Iterable in kotlin.collections", typeText: "List" } +// EXIST: { itemText: "map", tailText: "(p3) for Iterable in kotlin.collections", typeText: "List" } diff --git a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt index ac124465ef7..3fa3974ee38 100644 --- a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt +++ b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature3.kt @@ -1,5 +1,5 @@ fun foo(list: List) { list. } -// EXIST: { itemText: "firstOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin", typeText: "String?" } -// EXIST: { itemText: "toMapBy", tailText: " {...} (selector: (String) -> K) for Iterable in kotlin", typeText: "Map" } +// EXIST: { itemText: "firstOrNull", tailText: " {...} (predicate: (String) -> Boolean) for Iterable in kotlin.collections", typeText: "String?" } +// EXIST: { itemText: "toMapBy", tailText: " {...} (selector: (String) -> K) for Iterable in kotlin.collections", typeText: "Map" } diff --git a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt index b762fad5c4a..7893e5b1877 100644 --- a/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt +++ b/idea/idea-completion/testData/basic/java/ExtensionFromStandardLibrary.kt @@ -8,5 +8,5 @@ fun firstFun() { } // INVOCATION_COUNT: 1 -// EXIST: { lookupString:"toLinkedMap", itemText:"toLinkedMap", tailText:"() for Map in kotlin" } +// EXIST: { lookupString:"toLinkedMap", itemText:"toLinkedMap", tailText:"() for Map in kotlin.collections" } // NOTHING_ELSE diff --git a/idea/idea-completion/testData/smart/forLoopRange/Simple.kt b/idea/idea-completion/testData/smart/forLoopRange/Simple.kt index f02bfed1c1a..d053a0658a0 100644 --- a/idea/idea-completion/testData/smart/forLoopRange/Simple.kt +++ b/idea/idea-completion/testData/smart/forLoopRange/Simple.kt @@ -12,5 +12,5 @@ fun f3(): Iterable{} // EXIST: f1 // ABSENT: f2 // EXIST: f3 -// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin)", typeText:"List" } +// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin.collections)", typeText:"List" } diff --git a/idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt b/idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt index 3f7a8ccda03..ded4412a5e2 100644 --- a/idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt +++ b/idea/idea-completion/testData/smart/forLoopRange/TypedLoopVar.kt @@ -10,4 +10,4 @@ fun foo(p1: Collection, p2: Collection, p3: Collection, p4: Collection< // EXIST: p2 // ABSENT: p3 // ABSENT: p4 -// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin)", typeText:"List" } +// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin.collections)", typeText:"List" } diff --git a/idea/idea-completion/testData/smart/generics/GenericFunction3.kt b/idea/idea-completion/testData/smart/generics/GenericFunction3.kt index 12f3de81524..f5bcc43071e 100644 --- a/idea/idea-completion/testData/smart/generics/GenericFunction3.kt +++ b/idea/idea-completion/testData/smart/generics/GenericFunction3.kt @@ -4,6 +4,6 @@ fun f(){ foo() } -// EXIST: { lookupString: "listOf", tailText: "() (kotlin)", typeText: "List" } -// EXIST: { lookupString: "listOf", tailText: "(vararg elements: String) (kotlin)", typeText: "List" } -// EXIST: { lookupString: "arrayListOf", tailText: "(vararg elements: String) (kotlin)", typeText: "ArrayList" } +// EXIST: { lookupString: "listOf", tailText: "() (kotlin.collections)", typeText: "List" } +// EXIST: { lookupString: "listOf", tailText: "(vararg elements: String) (kotlin.collections)", typeText: "List" } +// EXIST: { lookupString: "arrayListOf", tailText: "(vararg elements: String) (kotlin.collections)", typeText: "ArrayList" } diff --git a/idea/idea-completion/testData/smart/generics/GenericFunction4.kt b/idea/idea-completion/testData/smart/generics/GenericFunction4.kt index 3dcc801f313..006a2ce2c71 100644 --- a/idea/idea-completion/testData/smart/generics/GenericFunction4.kt +++ b/idea/idea-completion/testData/smart/generics/GenericFunction4.kt @@ -2,5 +2,5 @@ fun foo(list: List): Collection { return list. } -// EXIST: { lookupString: "map", tailText: " {...} (transform: (String) -> Int) for Iterable in kotlin", typeText: "List" } +// EXIST: { lookupString: "map", tailText: " {...} (transform: (String) -> Int) for Iterable in kotlin.collections", typeText: "List" } // ABSENT: filter diff --git a/idea/idea-completion/testData/smart/inOperator/GenericMethod.kt b/idea/idea-completion/testData/smart/inOperator/GenericMethod.kt index b3e55274d6a..eb8ef49d6f5 100644 --- a/idea/idea-completion/testData/smart/inOperator/GenericMethod.kt +++ b/idea/idea-completion/testData/smart/inOperator/GenericMethod.kt @@ -2,4 +2,4 @@ fun foo(s: String) { if (s in ) } -// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin)", typeText:"List" } +// EXIST: { lookupString:"listOf", itemText: "listOf", tailText: "(vararg elements: T) (kotlin.collections)", typeText:"List" } diff --git a/idea/testData/editor/quickDoc/MethodFromStdLib.kt b/idea/testData/editor/quickDoc/MethodFromStdLib.kt index ae99f3c9254..e07071140f2 100644 --- a/idea/testData/editor/quickDoc/MethodFromStdLib.kt +++ b/idea/testData/editor/quickDoc/MethodFromStdLib.kt @@ -2,4 +2,4 @@ fun test() { listOf(1, 2, 4).filter { it > 0 } } -//INFO: public inline fun <T> Iterable<T>.filter(predicate: (T) → Boolean): List<T> defined in kotlin

Returns a list containing only elements matching the given predicate.

+//INFO: public inline fun <T> Iterable<T>.filter(predicate: (T) → Boolean): List<T> defined in kotlin.collections

Returns a list containing only elements matching the given predicate.

diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt index ab3c5d372c9..2aaefc010b1 100644 --- a/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt +++ b/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt @@ -1,4 +1,4 @@ -fun foo(c: kotlin.support.AbstractIterator>) { +fun foo(c: kotlin.collections.AbstractIterator>) { bar(c) } diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt.after index 2e636643e12..1dc4599d0d7 100644 --- a/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt.after +++ b/idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt.after @@ -1,7 +1,6 @@ import kotlin.properties.ObservableProperty -import kotlin.support.AbstractIterator -fun foo(c: kotlin.support.AbstractIterator>) { +fun foo(c: kotlin.collections.AbstractIterator>) { bar>>(c) } diff --git a/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt index f7785151a54..ea222c2b611 100644 --- a/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt +++ b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt @@ -1,5 +1,5 @@ fun main() { - val randomFunction: (x: kotlin.support.AbstractIterator, y: kotlin.String) -> kotlin.String = { x, str -> str} + val randomFunction: (x: kotlin.properties.ObservableProperty, y: kotlin.String) -> kotlin.String = { x, str -> str} } // WITH_RUNTIME diff --git a/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after index 57f2ebec41f..a822092f8d3 100644 --- a/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after +++ b/idea/testData/intentions/specifyExplicitLambdaSignature/shortenReferencesForParams.kt.after @@ -1,7 +1,7 @@ -import kotlin.support.AbstractIterator +import kotlin.properties.ObservableProperty fun main() { - val randomFunction: (x: kotlin.support.AbstractIterator, y: kotlin.String) -> kotlin.String = { x: AbstractIterator, str: String -> str} + val randomFunction: (x: kotlin.properties.ObservableProperty, y: kotlin.String) -> kotlin.String = { x: ObservableProperty, str: String -> str} } // WITH_RUNTIME diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt index 5430ccde775..76403f2cef7 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: (kotlin).arrayListOf(T) +// REF: (kotlin.collections).arrayListOf(T) diff --git a/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt b/idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt index 89d9c54a26f..86b4e69d729 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: (kotlin).arrayListOf(T) +// REF: (kotlin.collections).arrayListOf(T) diff --git a/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt b/idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt index ca6f86b67b2..79300255829 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.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Array in kotlin.collections).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for BooleanArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Boolean) -> CharSequence)?) +// REF: (for BooleanArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Boolean) -> String)?) +// REF: (for ByteArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Byte) -> CharSequence)?) +// REF: (for ByteArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Byte) -> String)?) +// REF: (for CharArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Char) -> CharSequence)?) +// REF: (for CharArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Char) -> String)?) +// REF: (for DoubleArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Double) -> CharSequence)?) +// REF: (for DoubleArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Double) -> String)?) +// REF: (for FloatArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Float) -> CharSequence)?) +// REF: (for FloatArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Float) -> String)?) +// REF: (for IntArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Int) -> CharSequence)?) +// REF: (for IntArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Int) -> String)?) +// REF: (for Iterable in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Iterable in kotlin.collections).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for LongArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Long) -> CharSequence)?) +// REF: (for LongArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Long) -> String)?) +// REF: (for Sequence in kotlin.sequences).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((T) -> CharSequence)?) +// REF: (for Sequence in kotlin.sequences).joinToString(String, String, String, Int, String, ((T) -> String)?) +// REF: (for ShortArray in kotlin.collections).joinToString(CharSequence, CharSequence, CharSequence, Int, CharSequence, ((Short) -> CharSequence)?) +// REF: (for ShortArray in kotlin.collections).joinToString(String, String, String, Int, String, ((Short) -> String)?) \ No newline at end of file diff --git a/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after index e8d1dc0707b..f72fb342033 100644 --- a/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after +++ b/idea/testData/quickfix/autoImports/libraryTopLevelFunctionImportRuntime.kt.after @@ -1,7 +1,7 @@ // "Import" "true" package some -import kotlin.util.measureTimeNano +import kotlin.system.measureTimeNano fun testFun() { measureTimeNano({}) diff --git a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt index 4340a0d0f09..b3e8105ed54 100644 --- a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt +++ b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt @@ -3,6 +3,6 @@ fun main(it: Iterator) { } // MULTIRESOLVE -// REF: (for kotlin.Iterator in kotlin).iterator() +// REF: (for kotlin.Iterator in kotlin.collections).iterator() // REF: (in kotlin.Iterator).hasNext() // REF: (in kotlin.Iterator).next() diff --git a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt index a4291f914cd..73f8de0eccd 100644 --- a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt +++ b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt @@ -3,6 +3,6 @@ fun main() { } // MULTIRESOLVE -// REF: (for kotlin.CharSequence in kotlin).iterator() +// REF: (for kotlin.CharSequence in kotlin.text).iterator() // REF: (in kotlin.CharIterator).next() // REF: (in kotlin.Iterator).hasNext() diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt index b4457fb40b4..6a6b481e194 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.FqName public class ClsStubConsistencyTest : StubConsistencyBaseTest() { override fun getVirtualFileFinder(): VirtualFileFinder = JvmVirtualFileFinder.SERVICE.getInstance(getProject()) - override fun getFileIds(): List = listOf(ClassId.topLevel(FqName("kotlin.CollectionsKt"))) + override fun getFileIds(): List = listOf(ClassId.topLevel(FqName("kotlin.collections.CollectionsKt"))) override fun createStubBuilder() = KotlinClsStubBuilder() diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 1073160bdcc..72db3478499 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -38,9 +38,9 @@ public class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { override fun getPackages(): List = emptyList() - override fun getFacades(): List = listOf(FqName("kotlin.CollectionsKt")) + override fun getFacades(): List = listOf(FqName("kotlin.collections.CollectionsKt")) - override fun getTopLevelMembers(): Map = mapOf("kotlin.CollectionsKt" to "linkedListOf") + override fun getTopLevelMembers(): Map = mapOf("kotlin.collections.CollectionsKt" to "linkedListOf") override fun getVirtualFileFinder(): VirtualFileFinder = JvmVirtualFileFinder.SERVICE.getInstance(project)