From aec2f19682e88e2c0f4f74c43cf1cc62ca880c73 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 27 Sep 2016 22:06:18 +0300 Subject: [PATCH] Renames --- .../idea/completion/BasicCompletionSession.kt | 4 ++-- .../idea/completion/CompletionSession.kt | 22 +++++++++---------- .../completion/KotlinCompletionContributor.kt | 8 +++---- .../smart/SmartCompletionSession.kt | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt index 10d89c03446..31876b2f953 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt @@ -276,7 +276,7 @@ class BasicCompletionSession( } } - if (configuration.completeStaticMembers && callTypeAndReceiver is CallTypeAndReceiver.DEFAULT && prefix.isNotEmpty()) { + if (configuration.staticMembers && callTypeAndReceiver is CallTypeAndReceiver.DEFAULT && prefix.isNotEmpty()) { staticMembersCompletion.completeFromIndices(indicesHelper(false), collector) } } @@ -594,7 +594,7 @@ class BasicCompletionSession( collector.addElement(basicLookupElementFactory.createLookupElementForJavaClass(javaClass), notImported = true) } AllClassesCompletion(parameters, indicesHelper(true), prefixMatcher, resolutionFacade, - kindFilter, includeTypeAliases, configuration.completeJavaClassesNotToBeUsed + kindFilter, includeTypeAliases, configuration.javaClassesNotToBeUsed ).collect(classifierDescriptorCollector, javaClassCollector) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index c368d89a2b6..395dcc0b62e 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt @@ -55,19 +55,19 @@ import java.util.* class CompletionSessionConfiguration( val useBetterPrefixMatcherForNonImportedClasses: Boolean, - val completeNonAccessibleDeclarations: Boolean, - val filterOutJavaGettersAndSetters: Boolean, - val completeJavaClassesNotToBeUsed: Boolean, - val completeStaticMembers: Boolean, + val nonAccessibleDeclarations: Boolean, + val javaGettersAndSetters: Boolean, + val javaClassesNotToBeUsed: Boolean, + val staticMembers: Boolean, val dataClassComponentFunctions: Boolean ) fun CompletionSessionConfiguration(parameters: CompletionParameters) = CompletionSessionConfiguration( useBetterPrefixMatcherForNonImportedClasses = parameters.invocationCount < 2, - completeNonAccessibleDeclarations = parameters.invocationCount >= 2, - filterOutJavaGettersAndSetters = parameters.invocationCount < 2, - completeJavaClassesNotToBeUsed = parameters.invocationCount >= 2, - completeStaticMembers = parameters.invocationCount >= 2, + nonAccessibleDeclarations = parameters.invocationCount >= 2, + javaGettersAndSetters = parameters.invocationCount >= 2, + javaClassesNotToBeUsed = parameters.invocationCount >= 2, + staticMembers = parameters.invocationCount >= 2, dataClassComponentFunctions = parameters.invocationCount >= 2 ) @@ -131,7 +131,7 @@ abstract class CompletionSession( protected val descriptorNameFilter: (Name) -> Boolean = descriptorStringNameFilter.toNameFilter() - protected val isVisibleFilter: (DeclarationDescriptor) -> Boolean = { isVisibleDescriptor(it, completeNonAccessible = configuration.completeNonAccessibleDeclarations) } + protected val isVisibleFilter: (DeclarationDescriptor) -> Boolean = { isVisibleDescriptor(it, completeNonAccessible = configuration.nonAccessibleDeclarations) } protected val isVisibleFilterCheckAlways: (DeclarationDescriptor) -> Boolean = { isVisibleDescriptor(it, completeNonAccessible = false) } protected val referenceVariantsHelper = ReferenceVariantsHelper(bindingContext, resolutionFacade, moduleDescriptor, isVisibleFilter) @@ -178,7 +178,7 @@ abstract class CompletionSession( } private fun isVisibleDescriptor(descriptor: DeclarationDescriptor, completeNonAccessible: Boolean): Boolean { - if (!configuration.completeJavaClassesNotToBeUsed && descriptor is ClassDescriptor) { + if (!configuration.javaClassesNotToBeUsed && descriptor is ClassDescriptor) { if (descriptor.importableFqName?.let { isJavaClassNotToBeUsedInKotlin(it) } == true) return false } @@ -342,7 +342,7 @@ abstract class CompletionSession( .invoke(notImportedExtensions) } - if (configuration.filterOutJavaGettersAndSetters) { + if (!configuration.javaGettersAndSetters) { variants = referenceVariantsHelper.filterOutJavaGettersAndSetters(variants) } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index bceec70d434..43abc6f88ee 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt @@ -301,10 +301,10 @@ class KotlinCompletionContributor : CompletionContributor() { // Rerun completion if nothing was found val newConfiguration = CompletionSessionConfiguration( useBetterPrefixMatcherForNonImportedClasses = false, - completeNonAccessibleDeclarations = false, - filterOutJavaGettersAndSetters = false, - completeJavaClassesNotToBeUsed = false, - completeStaticMembers = parameters.invocationCount > 0, + nonAccessibleDeclarations = false, + javaGettersAndSetters = true, + javaClassesNotToBeUsed = false, + staticMembers = parameters.invocationCount > 0, dataClassComponentFunctions = true ) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt index f15825960e8..c0ae08b7b52 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt @@ -150,7 +150,7 @@ class SmartCompletionSession( } } - if (staticMembersCompletion != null && configuration.completeStaticMembers) { + if (staticMembersCompletion != null && configuration.staticMembers) { val decoratedFactory = staticMembersCompletion.decoratedLookupElementFactory(ItemPriority.STATIC_MEMBER) staticMembersCompletion.processMembersFromIndices(indicesHelper(false)) { filter(it, decoratedFactory).forEach {