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

FIR IDE: move CompletionVisibilityChecker/ExtensionApplicabilityChecker to dedicated package

Browse Source
This commit is contained in:
Ilya Kirillov
2021-05-15 17:57:55 +02:00
committed by TeamCityServer
parent a437cd9d86
commit 8dda232ae3
4 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+2 -17
View File
@@ -10,6 +10,8 @@ import com.intellij.patterns.PlatformPatterns
import com.intellij.patterns.PsiJavaPatterns
import com.intellij.util.ProcessingContext
import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
import org.jetbrains.kotlin.idea.completion.checkers.CompletionVisibilityChecker
import org.jetbrains.kotlin.idea.completion.checkers.ExtensionApplicabilityChecker
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirNameReferencePositionContext
import org.jetbrains.kotlin.idea.completion.context.FirPositionCompletionContextDetector
@@ -25,7 +27,6 @@ import org.jetbrains.kotlin.idea.frontend.api.components.KtScopeContext
import org.jetbrains.kotlin.idea.frontend.api.scopes.KtCompositeScope
import org.jetbrains.kotlin.idea.frontend.api.scopes.KtScope
import org.jetbrains.kotlin.idea.frontend.api.symbols.*
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility
import org.jetbrains.kotlin.idea.frontend.api.types.KtClassType
import org.jetbrains.kotlin.idea.frontend.api.types.KtType
import org.jetbrains.kotlin.lexer.KtTokens
@@ -104,22 +105,6 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
}
}
internal fun interface ExtensionApplicabilityChecker {
fun KtAnalysisSession.isApplicable(symbol: KtCallableSymbol): Boolean
}
internal fun interface CompletionVisibilityChecker {
fun KtAnalysisSession.isVisible(symbol: KtSymbolWithVisibility): Boolean
fun KtAnalysisSession.isVisible(symbol: KtCallableSymbol): Boolean {
return symbol !is KtSymbolWithVisibility || isVisible(symbol as KtSymbolWithVisibility)
}
fun KtAnalysisSession.isVisible(symbol: KtClassifierSymbol): Boolean {
return symbol !is KtSymbolWithVisibility || isVisible(symbol as KtSymbolWithVisibility)
}
}
/**
* Currently, this class is responsible for collecting all possible completion variants.
*
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/checkers/CompletionVisibilityChecker.kt
+23
View File
@@ -0,0 +1,23 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.completion.checkers
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.KtClassifierSymbol
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithVisibility
internal fun interface CompletionVisibilityChecker {
fun KtAnalysisSession.isVisible(symbol: KtSymbolWithVisibility): Boolean
fun KtAnalysisSession.isVisible(symbol: KtCallableSymbol): Boolean {
return symbol !is KtSymbolWithVisibility || isVisible(symbol as KtSymbolWithVisibility)
}
fun KtAnalysisSession.isVisible(symbol: KtClassifierSymbol): Boolean {
return symbol !is KtSymbolWithVisibility || isVisible(symbol as KtSymbolWithVisibility)
}
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/checkers/ExtensionApplicabilityChecker.kt
+13
View File
@@ -0,0 +1,13 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.completion.checkers
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.symbols.KtCallableSymbol
internal fun interface ExtensionApplicabilityChecker {
fun KtAnalysisSession.isApplicable(symbol: KtCallableSymbol): Boolean
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirClassifierCompletionContributor.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.completion.contributors
import org.jetbrains.kotlin.idea.completion.CompletionVisibilityChecker
import org.jetbrains.kotlin.idea.completion.checkers.CompletionVisibilityChecker
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.fir.low.level.api.IndexHelper
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession