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

fix after rebase

Browse Source
This commit is contained in:
Ilya Kirillov
2021-05-26 16:09:27 +02:00
committed by TeamCityServer
parent a926a1f534
commit 0534d3fb98
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/checkers/CompletionVisibilityChecker.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.completion.checkers package org.jetbrains.kotlin.idea.completion.checkers
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirNameReferenceRawPositionContext import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassifierSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtClassifierSymbol
@@ -26,7 +26,7 @@ internal fun interface CompletionVisibilityChecker {
companion object { companion object {
fun create( fun create(
basicContext: FirBasicCompletionContext, basicContext: FirBasicCompletionContext,
positionContext: FirNameReferenceRawPositionContext positionContext: FirNameReferencePositionContext
): CompletionVisibilityChecker = CompletionVisibilityChecker { ): CompletionVisibilityChecker = CompletionVisibilityChecker {
basicContext.parameters.invocationCount > 1 || isVisible( basicContext.parameters.invocationCount > 1 || isVisible(
it, it,
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirClassifierCompletionContributor.kt
+4 -4
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.completion.contributors
import org.jetbrains.kotlin.idea.completion.checkers.CompletionVisibilityChecker import org.jetbrains.kotlin.idea.completion.checkers.CompletionVisibilityChecker
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirNameReferenceRawPositionContext import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
import org.jetbrains.kotlin.idea.completion.contributors.helpers.getStaticScope import org.jetbrains.kotlin.idea.completion.contributors.helpers.getStaticScope
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.symbols.* import org.jetbrains.kotlin.idea.frontend.api.symbols.*
@@ -17,11 +17,11 @@ import org.jetbrains.kotlin.psi.KtExpression
internal open class FirClassifierCompletionContributor( internal open class FirClassifierCompletionContributor(
basicContext: FirBasicCompletionContext, basicContext: FirBasicCompletionContext,
) : FirContextCompletionContributorBase<FirNameReferenceRawPositionContext>(basicContext) { ) : FirContextCompletionContributorBase<FirNameReferencePositionContext>(basicContext) {
protected open fun KtAnalysisSession.filterClassifiers(classifierSymbol: KtClassifierSymbol): Boolean = true protected open fun KtAnalysisSession.filterClassifiers(classifierSymbol: KtClassifierSymbol): Boolean = true
override fun KtAnalysisSession.complete(positionContext: FirNameReferenceRawPositionContext) { override fun KtAnalysisSession.complete(positionContext: FirNameReferencePositionContext) {
val visibilityChecker = CompletionVisibilityChecker.create(basicContext, positionContext) val visibilityChecker = CompletionVisibilityChecker.create(basicContext, positionContext)
when (val receiver = positionContext.explicitReceiver) { when (val receiver = positionContext.explicitReceiver) {
@@ -48,7 +48,7 @@ internal open class FirClassifierCompletionContributor(
} }
private fun KtAnalysisSession.completeWithoutReceiver( private fun KtAnalysisSession.completeWithoutReceiver(
positionContext: FirNameReferenceRawPositionContext, positionContext: FirNameReferencePositionContext,
visibilityChecker: CompletionVisibilityChecker visibilityChecker: CompletionVisibilityChecker
) { ) {
val implicitScopes = originalKtFile.getScopeContextForPosition(positionContext.nameExpression).scopes val implicitScopes = originalKtFile.getScopeContextForPosition(positionContext.nameExpression).scopes
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirContextCompletionContributorBase.kt
+2 -2
View File
@@ -6,12 +6,12 @@
package org.jetbrains.kotlin.idea.completion.contributors package org.jetbrains.kotlin.idea.completion.contributors
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirNameReferenceRawPositionContext import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
import org.jetbrains.kotlin.idea.completion.context.FirRawPositionCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirRawPositionCompletionContext
import org.jetbrains.kotlin.idea.fir.low.level.api.IndexHelper import org.jetbrains.kotlin.idea.fir.low.level.api.IndexHelper
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.scopes.KtScopeNameFilter import org.jetbrains.kotlin.idea.frontend.api.scopes.KtScopeNameFilter
internal abstract class FirContextCompletionContributorBase<C : FirNameReferenceRawPositionContext>( internal abstract class FirContextCompletionContributorBase<C : FirNameReferencePositionContext>(
basicContext: FirBasicCompletionContext basicContext: FirBasicCompletionContext
) : FirCompletionContributorBase<C>(basicContext) ) : FirCompletionContributorBase<C>(basicContext)
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirPackageCompletionContributor.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.completion.contributors package org.jetbrains.kotlin.idea.completion.contributors
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirNameReferenceRawPositionContext import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
import org.jetbrains.kotlin.idea.completion.context.FirRawPositionCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirRawPositionCompletionContext
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPackageSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPackageSymbol
@@ -18,7 +18,7 @@ internal class FirPackageCompletionContributor(
) : FirCompletionContributorBase<FirRawPositionCompletionContext>(basicContext) { ) : FirCompletionContributorBase<FirRawPositionCompletionContext>(basicContext) {
override fun KtAnalysisSession.complete(positionContext: FirRawPositionCompletionContext) { override fun KtAnalysisSession.complete(positionContext: FirRawPositionCompletionContext) {
val rootSymbol = if (positionContext !is FirNameReferenceRawPositionContext || positionContext.explicitReceiver == null) { val rootSymbol = if (positionContext !is FirNameReferencePositionContext || positionContext.explicitReceiver == null) {
ROOT_PACKAGE_SYMBOL ROOT_PACKAGE_SYMBOL
} else { } else {
positionContext.explicitReceiver?.reference()?.resolveToSymbol() as? KtPackageSymbol positionContext.explicitReceiver?.reference()?.resolveToSymbol() as? KtPackageSymbol
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirSuperEntryContributor.kt
+3 -3
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.completion.contributors
import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.codeInsight.lookup.LookupElementBuilder
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirSuperTypeCallNameReferenceRawPositionContext import org.jetbrains.kotlin.idea.completion.context.FirSuperTypeCallNameReferencePositionContext
import org.jetbrains.kotlin.idea.completion.contributors.helpers.FirSuperEntriesProvider.getSuperClassesAvailableForSuperCall import org.jetbrains.kotlin.idea.completion.contributors.helpers.FirSuperEntriesProvider.getSuperClassesAvailableForSuperCall
import org.jetbrains.kotlin.idea.completion.contributors.helpers.SuperCallLookupObject import org.jetbrains.kotlin.idea.completion.contributors.helpers.SuperCallLookupObject
import org.jetbrains.kotlin.idea.completion.contributors.helpers.SuperCallInsertionHandler import org.jetbrains.kotlin.idea.completion.contributors.helpers.SuperCallInsertionHandler
@@ -18,8 +18,8 @@ import org.jetbrains.kotlin.name.Name
internal class FirSuperEntryContributor( internal class FirSuperEntryContributor(
basicContext: FirBasicCompletionContext, basicContext: FirBasicCompletionContext,
) : FirContextCompletionContributorBase<FirSuperTypeCallNameReferenceRawPositionContext>(basicContext) { ) : FirContextCompletionContributorBase<FirSuperTypeCallNameReferencePositionContext>(basicContext) {
override fun KtAnalysisSession.complete(positionContext: FirSuperTypeCallNameReferenceRawPositionContext) { override fun KtAnalysisSession.complete(positionContext: FirSuperTypeCallNameReferencePositionContext) {
getSuperClassesAvailableForSuperCall(positionContext.nameExpression).forEach { superType -> getSuperClassesAvailableForSuperCall(positionContext.nameExpression).forEach { superType ->
val tailText = superType.classIdIfNonLocal?.asString()?.let { "($it)" } val tailText = superType.classIdIfNonLocal?.asString()?.let { "($it)" }
LookupElementBuilder.create(SuperLookupObject(superType.name, superType.classIdIfNonLocal), superType.name.asString()) LookupElementBuilder.create(SuperLookupObject(superType.name, superType.classIdIfNonLocal), superType.name.asString())