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

CreateExpectedFix: remove recursive call from findAndApplyExistingClasses

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-26 14:01:55 +07:00
parent 35d64f85f8
commit 531f695404
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+10 -7
View File
@@ -164,14 +164,17 @@ class CreateExpectedClassFix(
generateClassOrObject(project, true, element, checker) generateClassOrObject(project, true, element, checker)
}) })
private tailrec fun TypeAccessibilityChecker.findAndApplyExistingClasses(elements: Collection<KtNamedDeclaration>): HashSet<String> { private fun TypeAccessibilityChecker.findAndApplyExistingClasses(elements: Collection<KtNamedDeclaration>): HashSet<String> {
val classes = elements.filterIsInstance<KtClassOrObject>() var classes = elements.filterIsInstance<KtClassOrObject>()
val existingNames = classes.mapNotNull { it.fqName?.asString() }.toHashSet() while (true) {
existingFqNames = existingNames val existingNames = classes.mapNotNull { it.fqName?.asString() }.toHashSet()
existingFqNames = existingNames
val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivate(it) } val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivate(it) }
return if (classes.size == newExistingClasses.size) existingNames if (classes.size == newExistingClasses.size) return existingNames
else findAndApplyExistingClasses(newExistingClasses)
classes = newExistingClasses
}
} }
private fun showUnknownTypesDialog(project: Project, declarationsWithNonExistentClasses: Collection<KtNamedDeclaration>): Boolean { private fun showUnknownTypesDialog(project: Project, declarationsWithNonExistentClasses: Collection<KtNamedDeclaration>): Boolean {