diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index 013f9145a7b..75044a267fe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -368,7 +368,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert return result } - private fun JetImportDirective.getImportedName(): String? = JetPsiUtil.getAliasName(this)?.getIdentifier() + private fun JetImportDirective.getImportedName(): String? = if (isAllUnder()) null else JetPsiUtil.getAliasName(this)?.getIdentifier() private fun targetFqName(ref: JetReferenceExpression): FqName? { return ref.resolveTargets().map { it.importableFqName }.toSet().singleOrNull() diff --git a/idea/testData/addImport/ImportFunctionBug.dependency.kt b/idea/testData/addImport/ImportFunctionBug.dependency.kt new file mode 100644 index 00000000000..787b01abe9e --- /dev/null +++ b/idea/testData/addImport/ImportFunctionBug.dependency.kt @@ -0,0 +1,3 @@ +package dependency + +fun String.util(){} \ No newline at end of file diff --git a/idea/testData/addImport/ImportFunctionBug.kt b/idea/testData/addImport/ImportFunctionBug.kt new file mode 100644 index 00000000000..70a0f9e173c --- /dev/null +++ b/idea/testData/addImport/ImportFunctionBug.kt @@ -0,0 +1,6 @@ +// IMPORT: dependency.util +import java.util.* + +fun foo() { + "".util() +} \ No newline at end of file diff --git a/idea/testData/addImport/ImportFunctionBug.kt.after b/idea/testData/addImport/ImportFunctionBug.kt.after new file mode 100644 index 00000000000..913ff0d7124 --- /dev/null +++ b/idea/testData/addImport/ImportFunctionBug.kt.after @@ -0,0 +1,7 @@ +// IMPORT: dependency.util +import dependency.* +import java.util.* + +fun foo() { + "".util() +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java index dc3dc3b35ff..9e4fcd00415 100644 --- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java @@ -180,6 +180,12 @@ public class AddImportTestGenerated extends AbstractAddImportTest { doTest(fileName); } + @TestMetadata("ImportFunctionBug.kt") + public void testImportFunctionBug() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportFunctionBug.kt"); + doTest(fileName); + } + @TestMetadata("ImportPackage.kt") public void testImportPackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportPackage.kt");