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 88f5b7cc049..07fa63b486d 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 @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter class BasicCompletionSession(configuration: CompletionSessionConfiguration, parameters: CompletionParameters, resultSet: CompletionResultSet) -: CompletionSessionBase(configuration, parameters, resultSet) { +: CompletionSession(configuration, parameters, resultSet) { private enum class CompletionKind( val descriptorKindFilter: DescriptorKindFilter?, 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 c9e90fc7177..445a2f6d240 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 @@ -70,7 +70,7 @@ fun CompletionSessionConfiguration(parameters: CompletionParameters) = Completio completeNonImportedDeclarations = parameters.getInvocationCount() >= 2, completeNonAccessibleDeclarations = parameters.getInvocationCount() >= 2) -abstract class CompletionSessionBase(protected val configuration: CompletionSessionConfiguration, +abstract class CompletionSession(protected val configuration: CompletionSessionConfiguration, protected val parameters: CompletionParameters, resultSet: CompletionResultSet) { protected val position: PsiElement = parameters.getPosition() diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt index f45ae823b6d..a033e8b712b 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt @@ -57,7 +57,7 @@ object KDocNameCompletionProvider: CompletionProvider() { } class KDocNameCompletionSession(parameters: CompletionParameters, - resultSet: CompletionResultSet): CompletionSessionBase(CompletionSessionConfiguration(parameters), parameters, resultSet) { + resultSet: CompletionResultSet): CompletionSession(CompletionSessionConfiguration(parameters), parameters, resultSet) { override val descriptorKindFilter: DescriptorKindFilter? get() = null override fun doComplete() { diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/SmartCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/SmartCompletionSession.kt index f9512d19e1c..fd370e8ee82 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/SmartCompletionSession.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/SmartCompletionSession.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter class SmartCompletionSession(configuration: CompletionSessionConfiguration, parameters: CompletionParameters, resultSet: CompletionResultSet) -: CompletionSessionBase(configuration, parameters, resultSet) { +: CompletionSession(configuration, parameters, resultSet) { // we do not include SAM-constructors because they are handled separately and adding them requires iterating of java classes override val descriptorKindFilter = DescriptorKindFilter.VALUES exclude SamConstructorDescriptorKindExclude