diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt index 7493def7e09..dbd13a35214 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt @@ -75,8 +75,8 @@ class NotImportedStaticMemberWeigher(private val classifier: ImportableFqNameCla class ImportedWeigher(private val classifier: ImportableFqNameClassifier) : LookupElementWeigher("kotlin.imported") { private enum class Weight { currentPackage, - defaultImport, preciseImport, + defaultImport, allUnderImport } diff --git a/idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasAfterExplicitlyImported.kt b/idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasAfterExplicitlyImported.kt new file mode 100644 index 00000000000..252b5771266 --- /dev/null +++ b/idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasAfterExplicitlyImported.kt @@ -0,0 +1,9 @@ +import java.lang.IllegalArgumentException + +fun some(e: IllegalArgumentException) { +} + +// INVOCATION_COUNT: 2 +// WITH_ORDER +// EXIST: { lookupString:"IllegalArgumentException", tailText:" (java.lang)" } +// EXIST: { lookupString:"IllegalArgumentException", tailText: " (kotlin)", typeText:"IllegalArgumentException" } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java index 6647cd5d75d..5426e969bf7 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java @@ -2761,6 +2761,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT doTest(fileName); } + @TestMetadata("StandardKotlinTypeAliasAfterExplicitlyImported.kt") + public void testStandardKotlinTypeAliasAfterExplicitlyImported() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasAfterExplicitlyImported.kt"); + doTest(fileName); + } + @TestMetadata("StandardKotlinTypeAliasFirst.kt") public void testStandardKotlinTypeAliasFirst() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/java/StandardKotlinTypeAliasFirst.kt"); diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ImportableFqNameClassifier.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ImportableFqNameClassifier.kt index 22efb8e9f33..1695ac2f4e9 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ImportableFqNameClassifier.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ImportableFqNameClassifier.kt @@ -51,8 +51,8 @@ class ImportableFqNameClassifier(private val file: KtFile) { enum class Classification { fromCurrentPackage, topLevelPackage, - defaultImport, preciseImport, + defaultImport, allUnderImport, siblingImported, notImported,