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

KTIJ-28167 [AA] Support SAM constructors in KtFirReferenceShortener

Browse Source 
Utilize `FirSamResolver` to obtain the potential SAM constructor
from the classifier

Also, accept K2_SYNTHETIC_RESOLVED in the `resolveUnqualifiedAccess`,
since this is the kind of resolve success which corresponds to the
SAM constructor call resolution

^KTIJ-28167 Fixed
This commit is contained in:
Roman Golyshev
2024-01-04 01:13:38 +01:00
committed by Space Team
parent e561de8a22
commit df8c6c694a
9 changed files with 117 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt
+21 -5
View File
@@ -43,6 +43,7 @@ import org.jetbrains.kotlin.fir.references.FirNamedReference
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.references.FirThisReference
import org.jetbrains.kotlin.fir.references.builder.buildSimpleNamedReference
import org.jetbrains.kotlin.fir.resolve.FirSamResolver
import org.jetbrains.kotlin.fir.resolve.SessionHolderImpl
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError
import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnmatchedTypeArgumentsError
@@ -283,15 +284,26 @@ private class FirShorteningContext(val analysisSession: KtFirAnalysisSession) {
return AvailableSymbol(classifierSymbol, ImportKind.fromScope(scope))
}
private fun FirClassLikeSymbol<*>.getSamConstructor(): FirNamedFunctionSymbol? {
val samResolver = FirSamResolver(firSession, analysisSession.getScopeSessionFor(firSession))
return samResolver.getSamConstructor(fir)?.symbol
}
/**
* Finds available constructors with a given [targetClassName] within the [scope].
* Finds constructors with a given [targetClassName] available within the [scope], including SAM constructors
* (which are not explicitly declared in the class).
*
* Do not confuse with constructors **declared** in the scope (see [FirScope.processDeclaredConstructors]).
*/
private fun findAvailableConstructors(scope: FirScope, targetClassName: Name): List<FirConstructorSymbol> {
val classifierSymbol = scope.findFirstClassifierByName(targetClassName) ?: return emptyList()
private fun findAvailableConstructors(scope: FirScope, targetClassName: Name): List<FirFunctionSymbol<*>> {
val classLikeSymbol = scope.findFirstClassifierByName(targetClassName) as? FirClassLikeSymbol
?: return emptyList()
return (classifierSymbol as? FirClassSymbol)?.declarationSymbols?.filterIsInstance<FirConstructorSymbol>().orEmpty()
val constructors = (classLikeSymbol as? FirClassSymbol)?.declarationSymbols?.filterIsInstance<FirConstructorSymbol>().orEmpty()
val samConstructor = classLikeSymbol.getSamConstructor()
return constructors + listOfNotNull(samConstructor)
}
fun findFunctionsInScopes(scopes: List<FirScope>, name: Name): List<AvailableSymbol<FirFunctionSymbol<*>>> {
@@ -983,7 +995,11 @@ private class ElementsToShortenCollector(
firResolveSession, fakeFirQualifiedAccess, name, expressionInScope
)
return candidates.filter { overloadCandidate ->
overloadCandidate.candidate.currentApplicability == CandidateApplicability.RESOLVED
when (overloadCandidate.candidate.currentApplicability) {
CandidateApplicability.RESOLVED -> true
CandidateApplicability.K2_SYNTHETIC_RESOLVED -> true // SAM constructor call
else -> false
}
}
}
analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/references/FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated.java
Generated
+18
View File
@@ -466,6 +466,18 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
runTest("analysis/analysis-api/testData/components/referenceShortener/shortenRange/referenceInNestedClass.kt");
}
@Test
@TestMetadata("samInterface_constructorCall.kt")
public void testSamInterface_constructorCall() throws Exception {
runTest("analysis/analysis-api/testData/components/referenceShortener/shortenRange/samInterface_constructorCall.kt");
}
@Test
@TestMetadata("samInterface_constructorCall_java.kt")
public void testSamInterface_constructorCall_java() throws Exception {
runTest("analysis/analysis-api/testData/components/referenceShortener/shortenRange/samInterface_constructorCall_java.kt");
}
@Test
@TestMetadata("sameNameDifferentParams.kt")
public void testSameNameDifferentParams() throws Exception {
@@ -727,6 +739,12 @@ public class FirIdeNormalAnalysisSourceModuleReferenceShortenerTestGenerated ext
runTest("analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedClassFromSupertypes6_java.kt");
}
@Test
@TestMetadata("nestedSamInterface_constructorCall.kt")
public void testNestedSamInterface_constructorCall() throws Exception {
runTest("analysis/analysis-api/testData/components/referenceShortener/shortenRange/nestedClasses/nestedSamInterface_constructorCall.kt");
}
@Test
@TestMetadata("TypeWithGenericsAsExtensionReceiverType_innerType.kt")
public void testTypeWithGenericsAsExtensionReceiverType_innerType() throws Exception {