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

[Analysis API] resolve [this] in KDoc to extension receiver

Browse Source 
^KT-62407 fixed
This commit is contained in:
Ilya Kirillov
2023-10-06 23:03:30 +02:00
committed by Space Team
parent a5a8f6736b
commit c32e7c723d
13 changed files with 258 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/references/Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+40
View File
@@ -1593,6 +1593,46 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier")
@TestDataPath("$PROJECT_ROOT")
public class ThisQualifier {
@Test
public void testAllFilesPresentInThisQualifier() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@Test
@TestMetadata("thisQualifierOnClass.kt")
public void testThisQualifierOnClass() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt");
}
@Test
@TestMetadata("thisQualifierOnFunction.kt")
public void testThisQualifierOnFunction() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt");
}
@Test
@TestMetadata("thisQualifierOnFunctionNoExtensionReceiver.kt")
public void testThisQualifierOnFunctionNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt");
}
@Test
@TestMetadata("thisQualifierOnProperty.kt")
public void testThisQualifierOnProperty() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt");
}
@Test
@TestMetadata("thisQualifierOnPropertyNoExtensionReceiver.kt")
public void testThisQualifierOnPropertyNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt");
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors")
@TestDataPath("$PROJECT_ROOT")
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
+15
View File
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.components.KtScopeContext
import org.jetbrains.kotlin.analysis.api.components.KtScopeKind
import org.jetbrains.kotlin.analysis.api.scopes.KtScope
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
@@ -19,6 +20,7 @@ import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty
import kotlin.reflect.KClass
import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.utils.printer.parentOfType
internal object KDocReferenceResolver {
@@ -77,11 +79,24 @@ internal object KDocReferenceResolver {
context(KtAnalysisSession)
private fun resolveKdocFqName(fqName: FqName, contextElement: KtElement): Collection<KtSymbol> {
getExtensionReceiverSymbolByThisQualifier(fqName, contextElement).ifNotEmpty { return this }
(getSymbolsFromScopes(fqName, contextElement) + listOfNotNull(getPackageSymbolIfPackageExists(fqName))).ifNotEmpty { return this }
getNonImportedSymbolsByFullyQualifiedName(fqName).ifNotEmpty { return this }
return emptyList()
}
context(KtAnalysisSession)
fun getExtensionReceiverSymbolByThisQualifier(fqName: FqName, contextElement: KtElement): Collection<KtSymbol> {
val owner = contextElement.parentOfType<KtDeclaration>() ?: return emptyList()
if (fqName.pathSegments().singleOrNull()?.asString() == "this") {
if (owner is KtCallableDeclaration && owner.receiverTypeReference != null) {
val symbol = owner.getSymbol() as? KtCallableSymbol ?: return emptyList()
return listOfNotNull(symbol.receiverParameter)
}
}
return emptyList()
}
context(KtAnalysisSession)
private fun getSymbolsFromScopes(fqName: FqName, contextElement: KtElement): Collection<KtSymbol> {
getSymbolsFromParentMemberScopes(fqName, contextElement).ifNotEmpty { return this }
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+40
View File
@@ -1593,6 +1593,46 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier")
@TestDataPath("$PROJECT_ROOT")
public class ThisQualifier {
@Test
public void testAllFilesPresentInThisQualifier() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@Test
@TestMetadata("thisQualifierOnClass.kt")
public void testThisQualifierOnClass() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt");
}
@Test
@TestMetadata("thisQualifierOnFunction.kt")
public void testThisQualifierOnFunction() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt");
}
@Test
@TestMetadata("thisQualifierOnFunctionNoExtensionReceiver.kt")
public void testThisQualifierOnFunctionNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt");
}
@Test
@TestMetadata("thisQualifierOnProperty.kt")
public void testThisQualifierOnProperty() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt");
}
@Test
@TestMetadata("thisQualifierOnPropertyNoExtensionReceiver.kt")
public void testThisQualifierOnPropertyNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt");
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors")
@TestDataPath("$PROJECT_ROOT")
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerated.java
Generated
+40
View File
@@ -1476,6 +1476,46 @@ public class FirIdeNormalAnalysisLibrarySourceModuleReferenceResolveTestGenerate
}
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier")
@TestDataPath("$PROJECT_ROOT")
public class ThisQualifier {
@Test
public void testAllFilesPresentInThisQualifier() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier"), Pattern.compile("^([^.]+)\\.kt$"), null, true, "withErrors");
}
@Test
@TestMetadata("thisQualifierOnClass.kt")
public void testThisQualifierOnClass() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt");
}
@Test
@TestMetadata("thisQualifierOnFunction.kt")
public void testThisQualifierOnFunction() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt");
}
@Test
@TestMetadata("thisQualifierOnFunctionNoExtensionReceiver.kt")
public void testThisQualifierOnFunctionNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt");
}
@Test
@TestMetadata("thisQualifierOnProperty.kt")
public void testThisQualifierOnProperty() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt");
}
@Test
@TestMetadata("thisQualifierOnPropertyNoExtensionReceiver.kt")
public void testThisQualifierOnPropertyNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt");
}
}
}
@Nested
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+40
View File
@@ -1593,6 +1593,46 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier")
@TestDataPath("$PROJECT_ROOT")
public class ThisQualifier {
@Test
public void testAllFilesPresentInThisQualifier() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@Test
@TestMetadata("thisQualifierOnClass.kt")
public void testThisQualifierOnClass() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt");
}
@Test
@TestMetadata("thisQualifierOnFunction.kt")
public void testThisQualifierOnFunction() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt");
}
@Test
@TestMetadata("thisQualifierOnFunctionNoExtensionReceiver.kt")
public void testThisQualifierOnFunctionNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt");
}
@Test
@TestMetadata("thisQualifierOnProperty.kt")
public void testThisQualifierOnProperty() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt");
}
@Test
@TestMetadata("thisQualifierOnPropertyNoExtensionReceiver.kt")
public void testThisQualifierOnPropertyNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt");
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors")
@TestDataPath("$PROJECT_ROOT")
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+40
View File
@@ -1593,6 +1593,46 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier")
@TestDataPath("$PROJECT_ROOT")
public class ThisQualifier {
@Test
public void testAllFilesPresentInThisQualifier() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier"), Pattern.compile("^([^.]+)\\.kt$"), null, true);
}
@Test
@TestMetadata("thisQualifierOnClass.kt")
public void testThisQualifierOnClass() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt");
}
@Test
@TestMetadata("thisQualifierOnFunction.kt")
public void testThisQualifierOnFunction() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt");
}
@Test
@TestMetadata("thisQualifierOnFunctionNoExtensionReceiver.kt")
public void testThisQualifierOnFunctionNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt");
}
@Test
@TestMetadata("thisQualifierOnProperty.kt")
public void testThisQualifierOnProperty() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt");
}
@Test
@TestMetadata("thisQualifierOnPropertyNoExtensionReceiver.kt")
public void testThisQualifierOnPropertyNoExtensionReceiver() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt");
}
}
@Nested
@TestMetadata("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors")
@TestDataPath("$PROJECT_ROOT")
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnClass.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
// UNRESOLVED_REFERENCE
/**
* [th<caret>is]
*/
class A {
}
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
/**
* [th<caret>is]
*/
fun AAA.foo() {
}
class AAA
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunction.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: extension receiver with type AAA
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnFunctionNoExtensionReceiver.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// UNRESOLVED_REFERENCE
/**
* [th<caret>is]
*/
fun foo() {
}
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
/**
* [th<caret>is]
*/
val AAA.foo
get() = 1
class AAA
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnProperty.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: extension receiver with type AAA
analysis/analysis-api/testData/referenceResolve/kDoc/thisQualifier/thisQualifierOnPropertyNoExtensionReceiver.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
// UNRESOLVED_REFERENCE
/**
* [th<caret>is]
*/
val foo
get() = 1