[Analysis API] add tests for containing declaration for delegated member scope

2022-10-24 23:41:53 +02:00
parent f5432127d1
commit e2416f48fe
9 changed files with 248 additions and 32 deletions
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2022 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.analysis.api.impl.base.test.cases.components.containingDeclarationProvider
+
+import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.renderScopeWithParentDeclarations
+import org.jetbrains.kotlin.analysis.test.framework.base.AbstractAnalysisApiSingleFileTest
+import org.jetbrains.kotlin.analysis.test.framework.services.expressionMarkerProvider
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.test.model.TestModule
+import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.assertions
+
+abstract class AbstractContainingDeclarationProviderByDelegatedMemberScopeTest : AbstractAnalysisApiSingleFileTest() {
+    override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
+        val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtClassOrObject>(ktFile)
+
+        val memberToContainingClass = analyseForTest(declaration) {
+            val symbol = declaration.getClassOrObjectSymbol()
+            renderScopeWithParentDeclarations(symbol.getDelegatedMemberScope())
+        }
+
+        testServices.assertions.assertEqualsToTestDataFileSibling(memberToContainingClass)
+    }
+}
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.contai

 import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
 import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
+import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.renderScopeWithParentDeclarations
 import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtClassLikeSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol
@@ -26,40 +27,9 @@ abstract class AbstractContainingDeclarationProviderByMemberScopeTest : Abstract

        val memberToContainingClass = analyseForTest(declaration) {
            val symbol = declaration.getClassOrObjectSymbol()
-            prettyPrint {
-                printCollection(symbol.getMemberScope().getAllSymbols().toList(), separator = "\n\n") { symbol ->
-                    val containingDeclaration = symbol.getContainingSymbol() as KtClassLikeSymbol
-                    append(symbol.render(renderingOptions))
-                    append(" fromClass ")
-                    append(containingDeclaration.classIdIfNonLocal?.asString())
-                    if (symbol.typeParameters.isNotEmpty()) {
-                        appendLine()
-                        withIndent {
-                            printCollection(symbol.typeParameters, separator = "\n") { typeParameter ->
-                                val containingDeclarationForTypeParameter = typeParameter.getContainingSymbol()
-                                append(typeParameter.render(renderingOptions))
-                                append(" from ")
-                                append(containingDeclarationForTypeParameter?.qualifiedNameString())
-                            }
-                        }
-                    }
-                }
-            }
+            renderScopeWithParentDeclarations(symbol.getMemberScope())
        }

        testServices.assertions.assertEqualsToTestDataFileSibling(memberToContainingClass)
    }
-
-    private fun KtSymbol.qualifiedNameString() = when (this) {
-        is KtClassLikeSymbol -> classIdIfNonLocal!!.asString()
-        is KtCallableSymbol -> callableIdIfNonLocal!!.toString()
-        else -> error("unknown symbol $this")
-    }
-
-    companion object {
-        val renderingOptions = KtDeclarationRendererOptions.DEFAULT.copy(
-            typeRendererOptions = KtTypeRendererOptions.SHORT_NAMES,
-            modifiers = emptySet()
-        )
-    }
 }
@@ -10,8 +10,12 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
 import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
 import org.jetbrains.kotlin.analysis.api.calls.KtCall
 import org.jetbrains.kotlin.analysis.api.calls.KtCallableMemberCall
+import org.jetbrains.kotlin.analysis.api.components.KtDeclarationRendererOptions
+import org.jetbrains.kotlin.analysis.api.components.KtTypeRendererOptions
 import org.jetbrains.kotlin.analysis.api.diagnostics.KtDiagnostic
 import org.jetbrains.kotlin.analysis.api.impl.base.KtMapBackedSubstitutor
+import org.jetbrains.kotlin.analysis.api.impl.base.test.cases.components.containingDeclarationProvider.AbstractContainingDeclarationProviderByMemberScopeTest
+import org.jetbrains.kotlin.analysis.api.scopes.KtScope
 import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
@@ -143,4 +147,36 @@ internal fun KtAnalysisSession.compareCalls(call1: KtCall, call2: KtCall): Int {
    // The order of candidate calls is non-deterministic. Sort by symbol string value.
    if (call1 !is KtCallableMemberCall<*, *> || call2 !is KtCallableMemberCall<*, *>) return 0
    return stringRepresentation(call1.partiallyAppliedSymbol).compareTo(stringRepresentation(call2.partiallyAppliedSymbol))
+}
+
+context(KtAnalysisSession)
+internal fun renderScopeWithParentDeclarations(scope: KtScope): String = prettyPrint {
+    fun KtSymbol.qualifiedNameString() = when (this) {
+        is KtClassLikeSymbol -> classIdIfNonLocal!!.asString()
+        is KtCallableSymbol -> callableIdIfNonLocal!!.toString()
+        else -> error("unknown symbol $this")
+    }
+
+    val renderingOptions = KtDeclarationRendererOptions.DEFAULT.copy(
+        typeRendererOptions = KtTypeRendererOptions.SHORT_NAMES,
+        modifiers = emptySet()
+    )
+
+    printCollection(scope.getAllSymbols().toList(), separator = "\n\n") { symbol ->
+        val containingDeclaration = symbol.getContainingSymbol() as KtClassLikeSymbol
+        append(symbol.render(renderingOptions))
+        append(" fromClass ")
+        append(containingDeclaration.classIdIfNonLocal?.asString())
+        if (symbol.typeParameters.isNotEmpty()) {
+            appendLine()
+            withIndent {
+                printCollection(symbol.typeParameters, separator = "\n") { typeParameter ->
+                    val containingDeclarationForTypeParameter = typeParameter.getContainingSymbol()
+                    append(typeParameter.render(renderingOptions))
+                    append(" from ")
+                    append(containingDeclarationForTypeParameter?.qualifiedNameString())
+                }
+            }
+        }
+    }
 }