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

Receiver refactoring in DataFlowValueFactory

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-11-17 10:39:41 +03:00
parent e56b898a53
commit f1034dbf19
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java
+6 -7
View File
@@ -104,7 +104,7 @@ public class DataFlowValueFactory {
}
@NotNull
public static DataFlowValue createDataFlowValue(@NotNull ThisReceiver receiver) {
public static DataFlowValue createDataFlowValueForStableReceiver(@NotNull ReceiverValue receiver) {
KotlinType type = receiver.getType();
return new DataFlowValue(receiver, type, STABLE_VALUE, getImmanentNullability(type));
}
@@ -124,12 +124,11 @@ public class DataFlowValueFactory {
@NotNull BindingContext bindingContext,
@NotNull DeclarationDescriptor containingDeclarationOrModule
) {
if (receiverValue instanceof TransientReceiver || receiverValue instanceof ScriptReceiver) {
KotlinType type = receiverValue.getType();
return new DataFlowValue(receiverValue, type, STABLE_VALUE, getImmanentNullability(type));
}
else if (receiverValue instanceof ClassReceiver || receiverValue instanceof ExtensionReceiver) {
return createDataFlowValue((ThisReceiver) receiverValue);
if (receiverValue instanceof TransientReceiver ||
receiverValue instanceof ScriptReceiver ||
receiverValue instanceof ClassReceiver ||
receiverValue instanceof ExtensionReceiver) {
return createDataFlowValueForStableReceiver(receiverValue);
}
else if (receiverValue instanceof ExpressionReceiver) {
return createDataFlowValue(((ExpressionReceiver) receiverValue).getExpression(),
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
+1 -1
View File
@@ -178,7 +178,7 @@ data class ExtractionData(
val typeInfo = context[BindingContext.EXPRESSION_TYPE_INFO, expression] ?: return emptySet()
(resolvedCall?.getImplicitReceiverValue() as? ThisReceiver)?.let {
return typeInfo.dataFlowInfo.getPossibleTypes(DataFlowValueFactory.createDataFlowValue(it))
return typeInfo.dataFlowInfo.getPossibleTypes(DataFlowValueFactory.createDataFlowValueForStableReceiver(it))
}
val type = resolvedCall?.resultingDescriptor?.returnType ?: return emptySet()
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/inferParameterInfo.kt
+1 -1
View File
@@ -281,7 +281,7 @@ private fun suggestParameterType(
val calleeExpression = resolvedCall!!.call.calleeExpression
val typeByDataFlowInfo = if (useSmartCastsIfPossible) {
bindingContext[BindingContext.EXPRESSION_TYPE_INFO, calleeExpression]?.dataFlowInfo?.let { dataFlowInfo ->
val possibleTypes = dataFlowInfo.getPossibleTypes(DataFlowValueFactory.createDataFlowValue(receiverToExtract))
val possibleTypes = dataFlowInfo.getPossibleTypes(DataFlowValueFactory.createDataFlowValueForStableReceiver(receiverToExtract))
if (possibleTypes.isNotEmpty()) CommonSupertypes.commonSupertype(possibleTypes) else null
}
} else null