Skip to content

Commit 86f6796

Browse files
dimonchik0036Space Team
authored andcommitted
[Analysis API] AbstractResolveReferenceTest: integrate AbstractIsImplicitCompanionReferenceTest
so the resolution tests would cover more cases, and there will be no need for separate configurations and test data ^KT-80084
1 parent b614b56 commit 86f6796

File tree

1,689 files changed

+48514
-16869
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,689 files changed

+48514
-16869
lines changed

analysis/analysis-api-impl-base/testFixtures/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/resolver/AbstractResolveReferenceTest.kt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerPro
2525
import org.jetbrains.kotlin.analysis.test.framework.services.toCaretMarker
2626
import org.jetbrains.kotlin.analysis.test.framework.utils.unwrapMultiReferences
2727
import org.jetbrains.kotlin.analysis.utils.printer.PrettyPrinter
28+
import org.jetbrains.kotlin.analysis.utils.printer.prettyPrint
2829
import org.jetbrains.kotlin.idea.references.KDocReference
2930
import org.jetbrains.kotlin.idea.references.KtReference
3031
import org.jetbrains.kotlin.psi.KtElement
@@ -71,7 +72,7 @@ abstract class AbstractResolveReferenceTest : AbstractResolveTest<KtReference?>(
7172
protected fun collectElementsToResolve(
7273
carets: List<FileMarker<Int>>,
7374
file: KtFile,
74-
): Collection<ResolveTestCaseContext<KtReference?>> = carets.flatMap<FileMarker<Int>, ResolveTestCaseContext<KtReference?>> { caret ->
75+
): Collection<ResolveTestCaseContext<KtReference?>> = carets.flatMap { caret ->
7576
val marker = caret.tagText
7677
val contexts: List<ResolveTestCaseContext<KtReference?>> = findReferencesAtCaret(file, caret.value).map { reference ->
7778
ResolveReferenceTestCaseContext(element = reference, marker = marker)
@@ -115,7 +116,19 @@ abstract class AbstractResolveReferenceTest : AbstractResolveTest<KtReference?>(
115116

116117
val renderPsiClassName = Directives.RENDER_PSI_CLASS_NAME in module.testModule.directives
117118
val options = createRenderingOptions(renderPsiClassName)
118-
renderResolvedTo(symbols, options, sortRenderedDeclarations = reference !is KDocReference) { getAdditionalSymbolInfo(it) }
119+
prettyPrint {
120+
appendLine("isImplicitReferenceToCompanion: ${reference.isImplicitReferenceToCompanion()}")
121+
appendLine("symbols:")
122+
withIndent {
123+
val resolvedSymbolsInfo = renderResolvedTo(
124+
symbols = symbols,
125+
renderer = options,
126+
sortRenderedDeclarations = reference !is KDocReference,
127+
) { getAdditionalSymbolInfo(it) }
128+
129+
append(resolvedSymbolsInfo)
130+
}
131+
}
119132
}
120133
}
121134

0 commit comments

Comments
 (0)