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

Allow getting operation node in annotation qualified expressions for now

Browse Source
This commit is contained in:
Nikolay Krasko
2018-10-30 11:38:40 +03:00
parent ff9477554f
commit d1e7229b7a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.kt
+16 -3
View File
@@ -17,8 +17,10 @@
package org.jetbrains.kotlin.resolve.calls package org.jetbrains.kotlin.resolve.calls
import com.intellij.lang.ASTNode import com.intellij.lang.ASTNode
import com.intellij.openapi.util.ThrowableComputable
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.AstLoadingFilter
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
@@ -347,6 +349,11 @@ class CallExpressionResolver(
val receiverDataFlowValue = (receiver as? ReceiverValue)?.let { dataFlowValueFactory.createDataFlowValue(it, context) } val receiverDataFlowValue = (receiver as? ReceiverValue)?.let { dataFlowValueFactory.createDataFlowValue(it, context) }
val receiverCanBeNull = receiverDataFlowValue != null && val receiverCanBeNull = receiverDataFlowValue != null &&
initialDataFlowInfoForArguments.getStableNullability(receiverDataFlowValue).canBeNull() initialDataFlowInfoForArguments.getStableNullability(receiverDataFlowValue).canBeNull()
val callOperationNode = AstLoadingFilter.forceEnableTreeLoading(element.qualified.containingFile, ThrowableComputable {
element.node
})
if (receiverDataFlowValue != null && element.safe) { if (receiverDataFlowValue != null && element.safe) {
// Additional "receiver != null" information should be applied if we consider a safe call // Additional "receiver != null" information should be applied if we consider a safe call
if (receiverCanBeNull) { if (receiverCanBeNull) {
@@ -354,12 +361,12 @@ class CallExpressionResolver(
receiverDataFlowValue, DataFlowValue.nullValue(builtIns), languageVersionSettings receiverDataFlowValue, DataFlowValue.nullValue(builtIns), languageVersionSettings
) )
} else if (receiver is ReceiverValue) { } else if (receiver is ReceiverValue) {
reportUnnecessarySafeCall(context.trace, receiver.type, element.node, receiver) reportUnnecessarySafeCall(context.trace, receiver.type, callOperationNode, receiver)
} }
} }
val selector = element.selector val selector = element.selector
var selectorTypeInfo = getUnsafeSelectorTypeInfo(receiver, element.node, selector, context, initialDataFlowInfoForArguments) var selectorTypeInfo = getUnsafeSelectorTypeInfo(receiver, callOperationNode, selector, context, initialDataFlowInfoForArguments)
if (receiver is Qualifier) { if (receiver is Qualifier) {
resolveDeferredReceiverInQualifiedExpression(receiver, selector, context) resolveDeferredReceiverInQualifiedExpression(receiver, selector, context)
@@ -428,7 +435,13 @@ class CallExpressionResolver(
var branchPointDataFlowInfo = receiverTypeInfo.dataFlowInfo var branchPointDataFlowInfo = receiverTypeInfo.dataFlowInfo
for (element in elementChain) { for (element in elementChain) {
val receiverType = receiverTypeInfo.type ?: ErrorUtils.createErrorType("Type for " + element.receiver.text) val receiverType = receiverTypeInfo.type
?: ErrorUtils.createErrorType(
"Type for " + when (val receiver = element.receiver) {
is KtNameReferenceExpression -> receiver.getReferencedName()
else -> receiver.text
}
)
val receiver = trace.get(BindingContext.QUALIFIER, element.receiver) val receiver = trace.get(BindingContext.QUALIFIER, element.receiver)
?: ExpressionReceiver.create(element.receiver, receiverType, trace.bindingContext) ?: ExpressionReceiver.create(element.receiver, receiverType, trace.bindingContext)