azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-15154 IllegalStateException on attempt to convert import statement to * if last added import is to typealias

Browse Source 
#KT-15154 fixed
This commit is contained in:
Simon Ogorodnik
2016-12-21 22:27:20 +03:00
committed by Simon Ogorodnik
parent 6273ab5d43
commit f9b2929bca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+2 -2
View File
@@ -94,7 +94,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
private fun isAlreadyImported(target: DeclarationDescriptor, topLevelScope: LexicalScope, targetFqName: FqName): Boolean { private fun isAlreadyImported(target: DeclarationDescriptor, topLevelScope: LexicalScope, targetFqName: FqName): Boolean {
val name = target.name val name = target.name
return when (target) { return when (target) {
is ClassDescriptor -> { is ClassifierDescriptorWithTypeParameters -> {
val classifier = topLevelScope.findClassifier(name, NoLookupLocation.FROM_IDE) val classifier = topLevelScope.findClassifier(name, NoLookupLocation.FROM_IDE)
classifier?.importableFqName == targetFqName classifier?.importableFqName == targetFqName
} }
@@ -144,7 +144,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
&& when (target) { && when (target) {
// this check does not give a guarantee that import with * will import the class - for example, // this check does not give a guarantee that import with * will import the class - for example,
// there can be classes with conflicting name in more than one import with * // there can be classes with conflicting name in more than one import with *
is ClassDescriptor -> topLevelScope.findClassifier(name, NoLookupLocation.FROM_IDE) == null is ClassifierDescriptorWithTypeParameters -> topLevelScope.findClassifier(name, NoLookupLocation.FROM_IDE) == null
is FunctionDescriptor, is PropertyDescriptor -> true is FunctionDescriptor, is PropertyDescriptor -> true
else -> error("Unknown kind of descriptor to import:$target") else -> error("Unknown kind of descriptor to import:$target")
} }