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

[AA] Fix KDoc reference resolution of non-imported companion object members

Browse Source 
- Similar to the fix for KTIJ-25995, the name interpretation collector
  needs to consider the companion object's member scope as well.

^KTIJ-25995
This commit is contained in:
Marco Pennekamp
2023-10-10 19:02:32 +02:00
committed by Space Team
parent 0add17d9da
commit ef484c7518
7 changed files with 43 additions and 1 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
+6
View File
@@ -1930,6 +1930,12 @@ public class Fe10IdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exte
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
+1 -1
View File
@@ -264,7 +264,7 @@ internal object KDocReferenceResolver {
else -> {
getClassOrObjectSymbolByClassId(classId)
?.getCombinedMemberScope()
?.getCompositeCombinedMemberAndCompanionObjectScope()
?.getCallableSymbols(callableId.callableName)
?.let(::addAll)
}
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1930,6 +1930,12 @@ public class FirIdeDependentAnalysisSourceModuleReferenceResolveTestGenerated ex
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1930,6 +1930,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceResolveTestGenerated exten
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/references/FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerated.java
Generated
+6
View File
@@ -1930,6 +1930,12 @@ public class FirStandaloneNormalAnalysisSourceModuleReferenceResolveTestGenerate
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt")
public void testInvalidPropertyAccessOnFunctionFromNonImportedCompanionObject() throws Exception {
runTest("analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt");
}
@Test
@TestMetadata("invalidPropertyAccessOnFunctionFromSuperClass.kt")
public void testInvalidPropertyAccessOnFunctionFromSuperClass() throws Exception {
analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
// FILE: A.kt
package bar
class A {
companion object {
fun toName(): String = ""
}
}
// FILE: main.kt
package baz
/**
* [bar.A.<caret>toName.length]
*/
fun foo() {}
analysis/analysis-api/testData/referenceResolve/kDoc/withErrors/invalidPropertyAccessOnFunctionFromNonImportedCompanionObject.txt
Vendored
+2
View File
@@ -0,0 +1,2 @@
Resolved to:
0: (in bar.A.Companion) fun toName(): kotlin.String