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

Partially support call with errors

Browse Source 
Cases with no candidates or with Ambiguity is not supported yet
This commit is contained in:
Stanislav Erokhin
2021-05-10 16:25:14 +02:00
parent 080a832605
commit 85d9e96632
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir-fe10-binding/src/org/jetbrains/kotlin/idea/fir/fe10/binding/CallAndResolverCallWrappers.kt
+8 -3
View File
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirValueParameter
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression
import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.realPsi
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance
import org.jetbrains.kotlin.idea.fir.fe10.* import org.jetbrains.kotlin.idea.fir.fe10.*
@@ -77,8 +78,12 @@ internal class FirWrapperResolvedCall(val firSimpleWrapperCall: FirSimpleWrapper
private val firCall get() = firSimpleWrapperCall.firCall private val firCall get() = firSimpleWrapperCall.firCall
private val context get() = firSimpleWrapperCall.context private val context get() = firSimpleWrapperCall.context
private val ktFunctionSymbol = firCall.withFir { private val ktFunctionSymbol: KtFunctionLikeSymbol = firCall.withFir {
context.ktAnalysisSessionFacade.buildSymbol((it.calleeReference as FirResolvedNamedReference).resolvedSymbol.fir) as KtFunctionLikeSymbol when (val calleeReference = it.calleeReference) {
is FirResolvedNamedReference -> context.ktAnalysisSessionFacade.buildSymbol(calleeReference.resolvedSymbol.fir) as KtFunctionLikeSymbol
is FirErrorNamedReference -> context.ktAnalysisSessionFacade.buildSymbol(calleeReference.candidateSymbol!!.fir) as KtFunctionLikeSymbol
else -> context.noImplementation("calleeReferenceType: ${calleeReference::class.java}")
}
} }
private val _typeArguments: Map<TypeParameterDescriptor, KotlinType> by lazy(LazyThreadSafetyMode.PUBLICATION) { private val _typeArguments: Map<TypeParameterDescriptor, KotlinType> by lazy(LazyThreadSafetyMode.PUBLICATION) {
@@ -210,7 +215,7 @@ class CallAndResolverCallWrappers(bindingContext: KtSymbolBasedBindingContext) {
private fun getCall(element: KtElement): Call { private fun getCall(element: KtElement): Call {
val ktCall = element.parent.safeAs<KtCallExpression>() ?: context.implementationPostponed() val ktCall = element.parent.safeAs<KtCallExpression>() ?: context.implementationPostponed()
val firCall = when (val fir = element.getOrBuildFir(context.ktAnalysisSessionFacade.firResolveState)) { val firCall = when (val fir = ktCall.getOrBuildFir(context.ktAnalysisSessionFacade.firResolveState)) {
is FirFunctionCall -> fir is FirFunctionCall -> fir
is FirSafeCallExpression -> fir.regularQualifiedAccess as? FirFunctionCall is FirSafeCallExpression -> fir.regularQualifiedAccess as? FirFunctionCall
else -> null else -> null
idea/testData/intentions/conventionNameCalls/replaceContains/invalidArgument.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
// IS_APPLICABLE: false // IS_APPLICABLE: false
// ERROR: Cannot find a parameter with this name: c // ERROR: Cannot find a parameter with this name: c
// ERROR: 'operator' modifier is inapplicable on this function: must have a single value parameter // ERROR: 'operator' modifier is inapplicable on this function: must have a single value parameter
// IGNORE_FE10_BINDING_BY_FIR
fun test() { fun test() {
class Test{ class Test{
operator fun contains(a: Int=1, b: Int=2): Boolean = true operator fun contains(a: Int=1, b: Int=2): Boolean = true
idea/testData/intentions/conventionNameCalls/replaceContains/missingArgument.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
// IS_APPLICABLE: false // IS_APPLICABLE: false
// ERROR: No value passed for parameter 'b' // ERROR: No value passed for parameter 'b'
// ERROR: 'operator' modifier is inapplicable on this function: must have a single value parameter // ERROR: 'operator' modifier is inapplicable on this function: must have a single value parameter
// IGNORE_FE10_BINDING_BY_FIR
fun test() { fun test() {
class Test{ class Test{
operator fun contains(a: Int, b: Int): Boolean = true operator fun contains(a: Int, b: Int): Boolean = true