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

Analysis API: Rename resolveCandidates to collectCallCandidates.

Browse Source 
Didn't bother to rename the directory in the test data.
This commit is contained in:
Mark Punzalan
2022-02-02 11:04:41 +00:00
committed by Ilya Kirillov
parent 58c6c25fe9
commit 7a1ef25333
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/components/AbstractResolveCandidatesTest.kt
+6 -8
View File
@@ -7,9 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.components
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.calls.KtCall
import org.jetbrains.kotlin.analysis.api.calls.KtCallInfo
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.expressionMarkerProvider
import org.jetbrains.kotlin.analysis.api.impl.base.test.test.framework.AbstractHLApiSingleModuleTest
import org.jetbrains.kotlin.psi.*
@@ -24,7 +22,7 @@ abstract class AbstractResolveCandidatesTest : AbstractHLApiSingleModuleTest() {
val actual = executeOnPooledThreadInReadAction {
analyseForTest(expression) {
val candidates = resolveCandidates(expression)
val candidates = collectCallCandidates(expression)
if (candidates.isEmpty()) {
"NO_CANDIDATES"
} else {
@@ -35,19 +33,19 @@ abstract class AbstractResolveCandidatesTest : AbstractHLApiSingleModuleTest() {
testServices.assertions.assertEqualsToTestDataFileSibling(actual)
}
private fun KtAnalysisSession.resolveCandidates(element: PsiElement): List<KtCallInfo> = when (element) {
is KtValueArgument -> resolveCandidates(element.getArgumentExpression()!!)
private fun KtAnalysisSession.collectCallCandidates(element: PsiElement): List<KtCallInfo> = when (element) {
is KtValueArgument -> this@collectCallCandidates.collectCallCandidates(element.getArgumentExpression()!!)
is KtDeclarationModifierList -> {
val annotationEntry = element.annotationEntries.singleOrNull()
?: error("Only single annotation entry is supported for now")
annotationEntry.resolveCandidates()
annotationEntry.collectCallCandidates()
}
is KtFileAnnotationList -> {
val annotationEntry = element.annotationEntries.singleOrNull()
?: error("Only single annotation entry is supported for now")
annotationEntry.resolveCandidates()
annotationEntry.collectCallCandidates()
}
is KtElement -> element.resolveCandidates()
is KtElement -> element.collectCallCandidates()
else -> error("Selected element type (${element::class.simpleName}) is not supported for resolveCandidates()")
}