Fixed a fail in import insertion
This commit is contained in:
@@ -368,7 +368,7 @@ public class ImportInsertHelperImpl(private val project: Project) : ImportInsert
|
|||||||
return result
|
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? {
|
private fun targetFqName(ref: JetReferenceExpression): FqName? {
|
||||||
return ref.resolveTargets().map { it.importableFqName }.toSet().singleOrNull()
|
return ref.resolveTargets().map { it.importableFqName }.toSet().singleOrNull()
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
package dependency
|
||||||
|
|
||||||
|
fun String.util(){}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// IMPORT: dependency.util
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
fun foo() {
|
||||||
|
"".util()
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
// IMPORT: dependency.util
|
||||||
|
import dependency.*
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
fun foo() {
|
||||||
|
"".util()
|
||||||
|
}
|
||||||
@@ -180,6 +180,12 @@ public class AddImportTestGenerated extends AbstractAddImportTest {
|
|||||||
doTest(fileName);
|
doTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("ImportFunctionBug.kt")
|
||||||
|
public void testImportFunctionBug() throws Exception {
|
||||||
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportFunctionBug.kt");
|
||||||
|
doTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("ImportPackage.kt")
|
@TestMetadata("ImportPackage.kt")
|
||||||
public void testImportPackage() throws Exception {
|
public void testImportPackage() throws Exception {
|
||||||
String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportPackage.kt");
|
String fileName = JetTestUtils.navigationMetadata("idea/testData/addImport/ImportPackage.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user