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

Fix KNPE in OptimizedImportsBuilder

Browse Source 
#KT-31637 Fixed
This commit is contained in:
Dmitry Gridin
2019-05-28 12:32:38 +07:00
parent f9d61f2dc7
commit aff8a3f97f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/util/OptimizedImportsBuilder.kt
+4 -5
View File
@@ -204,10 +204,7 @@ class OptimizedImportsBuilder(
if (!areTargetsEqual(oldTargets, newTargets)) { if (!areTargetsEqual(oldTargets, newTargets)) {
testLog?.append("Changed resolve of $ref\n") testLog?.append("Changed resolve of $ref\n")
(oldTargets + newTargets).forEach { (oldTargets + newTargets).forEach {
lockImportForDescriptor( lockImportForDescriptor(it, names)
it,
data.namesToImport.getOrElse(it.importableFqName!!) { listOf(it.name) }.intersect(names)
)
} }
} }
} }
@@ -217,8 +214,10 @@ class OptimizedImportsBuilder(
return sortedImportsToGenerate return sortedImportsToGenerate
} }
private fun lockImportForDescriptor(descriptor: DeclarationDescriptor, names: Collection<Name>) { private fun lockImportForDescriptor(descriptor: DeclarationDescriptor, existingNames: Collection<Name>) {
val fqName = descriptor.importableFqName ?: return val fqName = descriptor.importableFqName ?: return
val names = data.namesToImport.getOrElse(fqName) { listOf(descriptor.name) }.intersect(existingNames)
val starImportPath = ImportPath(fqName.parent(), true) val starImportPath = ImportPath(fqName.parent(), true)
val importPaths = file.importDirectives.map { it.importPath } val importPaths = file.importDirectives.map { it.importPath }