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

Minor. Reformat JavaNullabilityChecker

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-26 18:23:21 +03:00
parent d93885e71c
commit 240311d9c7
1 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaNullabilityChecker.kt
+10 -3
View File
@@ -59,7 +59,8 @@ class JavaNullabilityChecker : AdditionalTypeChecker {
val enumClassDescriptor = WhenChecker.getClassDescriptorOfTypeIfEnum(type) ?: return val enumClassDescriptor = WhenChecker.getClassDescriptorOfTypeIfEnum(type) ?: return
val context = c.trace.bindingContext val context = c.trace.bindingContext
if (WhenChecker.getEnumMissingCases(expression, context, enumClassDescriptor).isEmpty() if (WhenChecker.getEnumMissingCases(expression, context, enumClassDescriptor).isEmpty()
&& !WhenChecker.containsNullCase(expression, context)) { && !WhenChecker.containsNullCase(expression, context)
) {
val subjectDataFlowValue = c.dataFlowValueFactory.createDataFlowValue(subjectExpression, type, c) val subjectDataFlowValue = c.dataFlowValueFactory.createDataFlowValue(subjectExpression, type, c)
val dataFlowInfo = c.trace[BindingContext.EXPRESSION_TYPE_INFO, subjectExpression]?.dataFlowInfo val dataFlowInfo = c.trace[BindingContext.EXPRESSION_TYPE_INFO, subjectExpression]?.dataFlowInfo
if (dataFlowInfo != null && !dataFlowInfo.getStableNullability(subjectDataFlowValue).canBeNull()) { if (dataFlowInfo != null && !dataFlowInfo.getStableNullability(subjectDataFlowValue).canBeNull()) {
@@ -102,7 +103,12 @@ class JavaNullabilityChecker : AdditionalTypeChecker {
} }
} }
override fun checkReceiver(receiverParameter: ReceiverParameterDescriptor, receiverArgument: ReceiverValue, safeAccess: Boolean, c: CallResolutionContext<*>) { override fun checkReceiver(
receiverParameter: ReceiverParameterDescriptor,
receiverArgument: ReceiverValue,
safeAccess: Boolean,
c: CallResolutionContext<*>
) {
val dataFlowValue by lazy(LazyThreadSafetyMode.NONE) { val dataFlowValue by lazy(LazyThreadSafetyMode.NONE) {
c.dataFlowValueFactory.createDataFlowValue(receiverArgument, c) c.dataFlowValueFactory.createDataFlowValue(receiverArgument, c)
} }
@@ -162,7 +168,8 @@ class JavaNullabilityChecker : AdditionalTypeChecker {
c: ResolutionContext<*>, c: ResolutionContext<*>,
body: () -> T body: () -> T
) = if (type.mustNotBeNull()?.isFromJava == true && ) = if (type.mustNotBeNull()?.isFromJava == true &&
c.dataFlowInfo.getStableNullability(dataFlowValue()).canBeNull()) c.dataFlowInfo.getStableNullability(dataFlowValue()).canBeNull()
)
body() body()
else else
null null