From ba0ba3422dd61705b99df9ee12c061a445898c1a Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 26 Aug 2019 14:28:51 +0700
Subject: [PATCH] CreateExpectedFix: rename `isCorrectAndHaveNonPrivate` to
 `isCorrectAndHaveNonPrivateModifier`

---
 .../quickfix/expectactual/CreateExpectedFix.kt     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
index c9ea6a45add..89eb160ee8f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
@@ -118,13 +118,13 @@ class CreateExpectedClassFix(
 ) : CreateExpectedFix<KtClassOrObject>(klass, outerExpectedClass, commonModule, block@{ project, checker, element ->
     val originalElements = element.collectDeclarations(withSelf = false).toList()
     val existingClasses = checker.findAndApplyExistingClasses(originalElements + klass)
-    if (!checker.isCorrectAndHaveNonPrivate(element)) {
+    if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
         showUnknownTypesError(element)
         return@block null
     }
 
     val (members, declarationsWithNonExistentClasses) = originalElements.partition {
-        checker.isCorrectAndHaveNonPrivate(it)
+        checker.isCorrectAndHaveNonPrivateModifier(it)
     }
 
     if (!showUnknownTypesDialog(project, declarationsWithNonExistentClasses)) return@block null
@@ -144,13 +144,13 @@ class CreateExpectedClassFix(
 
     val selectedClasses = checker.findAndApplyExistingClasses(selectedElements)
     val resultDeclarations = if (selectedClasses != existingClasses) {
-        if (!checker.isCorrectAndHaveNonPrivate(element)) {
+        if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
             showUnknownTypesError(element)
             return@block null
         }
 
         val (resultDeclarations, withErrors) = selectedElements.partition {
-            checker.isCorrectAndHaveNonPrivate(it)
+            checker.isCorrectAndHaveNonPrivateModifier(it)
         }
         if (!showUnknownTypesDialog(project, withErrors)) return@block null
         resultDeclarations
@@ -170,7 +170,7 @@ private fun TypeAccessibilityChecker.findAndApplyExistingClasses(elements: Colle
         val existingNames = classes.mapNotNull { it.fqName?.asString() }.toHashSet()
         existingTypeNames = existingNames
 
-        val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivate(it) }
+        val newExistingClasses = classes.filter { isCorrectAndHaveNonPrivateModifier(it) }
         if (classes.size == newExistingClasses.size) return existingNames
 
         classes = newExistingClasses
@@ -300,7 +300,7 @@ class CreateExpectedCallableMemberFix(
     targetExpectedClass: KtClassOrObject?,
     commonModule: Module
 ) : CreateExpectedFix<KtNamedDeclaration>(declaration, targetExpectedClass, commonModule, block@{ project, checker, element ->
-    if (!checker.isCorrectAndHaveNonPrivate(element)) {
+    if (!checker.isCorrectAndHaveNonPrivateModifier(element)) {
         showUnknownTypesError(element)
         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)
\ No newline at end of file