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

CreateExpectedFix: rename isCorrectAndHaveNonPrivate to isCorrectAndHaveNonPrivateModifier

Browse Source
This commit is contained in:
Dmitry Gridin
2019-08-26 14:28:51 +07:00
parent 3c6da0bfe6
commit ba0ba3422d
1 changed files with 7 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
+7 -7
View File
@@ -118,13 +118,13 @@ class CreateExpectedClassFix(
) : CreateExpectedFix<KtClassOrObject>(klass, outerExpectedClass, commonModule, block@{ project, checker, element -> ) : CreateExpectedFix<KtClassOrObject>(klass, outerExpectedClass, commonModule, block@{ project, checker, element ->
val originalElements = element.collectDeclarations(withSelf = false).toList() val originalElements = element.collectDeclarations(withSelf = false).toList()
val existingClasses = checker.findAndApplyExistingClasses(originalElements + klass) val existingClasses = checker.findAndApplyExistingClasses(originalElements + klass)
if (!checker.isCorrectAndHaveNonPrivate(element)) { if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
showUnknownTypesError(element) showUnknownTypesError(element)
return@block null return@block null
} }
val (members, declarationsWithNonExistentClasses) = originalElements.partition { val (members, declarationsWithNonExistentClasses) = originalElements.partition {
checker.isCorrectAndHaveNonPrivate(it) checker.isCorrectAndHaveNonPrivateModifier(it)
} }
if (!showUnknownTypesDialog(project, declarationsWithNonExistentClasses)) return@block null if (!showUnknownTypesDialog(project, declarationsWithNonExistentClasses)) return@block null
@@ -144,13 +144,13 @@ class CreateExpectedClassFix(
val selectedClasses = checker.findAndApplyExistingClasses(selectedElements) val selectedClasses = checker.findAndApplyExistingClasses(selectedElements)
val resultDeclarations = if (selectedClasses != existingClasses) { val resultDeclarations = if (selectedClasses != existingClasses) {
if (!checker.isCorrectAndHaveNonPrivate(element)) { if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
showUnknownTypesError(element) showUnknownTypesError(element)
return@block null return@block null
} }
val (resultDeclarations, withErrors) = selectedElements.partition { val (resultDeclarations, withErrors) = selectedElements.partition {
checker.isCorrectAndHaveNonPrivate(it) checker.isCorrectAndHaveNonPrivateModifier(it)
} }
if (!showUnknownTypesDialog(project, withErrors)) return@block null if (!showUnknownTypesDialog(project, withErrors)) return@block null
resultDeclarations resultDeclarations
@@ -170,7 +170,7 @@ private fun TypeAccessibilityChecker.findAndApplyExistingClasses(elements: Colle
val existingNames = classes.mapNotNull { it.fqName?.asString() }.toHashSet() val existingNames = classes.mapNotNull { it.fqName?.asString() }.toHashSet()
existingTypeNames = existingNames existingTypeNames = existingNames
val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivate(it) } val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivateModifier(it) }
if (classes.size == newExistingClasses.size) return existingNames if (classes.size == newExistingClasses.size) return existingNames
classes = newExistingClasses classes = newExistingClasses
@@ -300,7 +300,7 @@ class CreateExpectedCallableMemberFix(
targetExpectedClass: KtClassOrObject?, targetExpectedClass: KtClassOrObject?,
commonModule: Module commonModule: Module
) : CreateExpectedFix<KtNamedDeclaration>(declaration, targetExpectedClass, commonModule, block@{ project, checker, element -> ) : CreateExpectedFix<KtNamedDeclaration>(declaration, targetExpectedClass, commonModule, block@{ project, checker, element ->
if (!checker.isCorrectAndHaveNonPrivate(element)) { if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
showUnknownTypesError(element) showUnknownTypesError(element)
return@block null return@block null
} }
@@ -318,5 +318,5 @@ class CreateExpectedCallableMemberFix(
} }
}) })
private fun TypeAccessibilityChecker.isCorrectAndHaveNonPrivate(declaration: KtNamedDeclaration): Boolean = private fun TypeAccessibilityChecker.isCorrectAndHaveNonPrivateModifier(declaration: KtNamedDeclaration): Boolean =
!declaration.hasPrivateModifier() && checkAccessibility(declaration) !declaration.hasPrivateModifier() && checkAccessibility(declaration)