diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt index 5bea526d2ef..b9a52f54eb1 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/references/AbstractReferenceShortenerForWholeFileTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references +import org.jetbrains.kotlin.analysis.api.components.ShortenOption import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.references.ShorteningResultsRenderer.renderShorteningResults import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiBasedSingleModuleTest import org.jetbrains.kotlin.analysis.test.framework.utils.executeOnPooledThreadInReadAction @@ -17,14 +18,22 @@ abstract class AbstractReferenceShortenerForWholeFileTest : AbstractAnalysisApiB override fun doTestByFileStructure(ktFiles: List, module: TestModule, testServices: TestServices) { val file = ktFiles.first() - val shortening = executeOnPooledThreadInReadAction { + val shortenings = executeOnPooledThreadInReadAction { analyseForTest(file) { - collectPossibleReferenceShortenings(file) + ShortenOption.values().map { option -> + val shorteningsForOption = collectPossibleReferenceShortenings(file, file.textRange, { option }, { option }) + + Pair(option.name, shorteningsForOption) + } } } val actual = buildString { - renderShorteningResults(shortening) + shortenings.forEach { (name, shortening) -> + appendLine("with ${name}:") + if (shortening.isEmpty) return@forEach + renderShorteningResults(shortening) + } } testServices.assertions.assertEqualsToTestDataFileSibling(actual) } diff --git a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.txt b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.txt index bb83b3ef081..5cbe8d2434e 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/referenceShortenerWholeFile/fileWithMultipleDeclarations.txt @@ -1,2 +1,10 @@ +with DO_NOT_SHORTEN: +with SHORTEN_IF_ALREADY_IMPORTED: +[type] A.B +[qualifier] C.D.Companion.foo() +with SHORTEN_AND_IMPORT: +[type] A.B +[qualifier] C.D.Companion.foo() +with SHORTEN_AND_STAR_IMPORT: [type] A.B [qualifier] C.D.Companion.foo()