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

Refactoring: extract anonymous objects to classes, rename variable

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-09-01 02:24:35 +03:00
parent f5222600d8
commit dde0efd8ab
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/FakeCallResolver.kt
+37 -39
View File
@@ -59,15 +59,15 @@ class FakeCallResolver(
val fakeTrace = TemporaryBindingTrace.create(context.trace, "trace to resolve fake call for", name) val fakeTrace = TemporaryBindingTrace.create(context.trace, "trace to resolve fake call for", name)
val fakeBindingTrace = context.replaceBindingTrace(fakeTrace) val fakeBindingTrace = context.replaceBindingTrace(fakeTrace)
var errorIsMissing = false var reportIsMissingError = false
val realExpression = RealExpression(reportErrorsOn, callKind) val realExpression = RealExpression(reportErrorsOn, callKind)
val result = makeAndResolveFakeCallInContext(receiver, fakeBindingTrace, valueArguments, name, callElement, realExpression) { fake -> val result = makeAndResolveFakeCallInContext(receiver, fakeBindingTrace, valueArguments, name, callElement, realExpression) { fake ->
errorIsMissing = fakeTrace.bindingContext.diagnostics.noSuppression().forElement(fake).any { it.severity == Severity.ERROR } reportIsMissingError = fakeTrace.bindingContext.diagnostics.noSuppression().forElement(fake).any { it.severity == Severity.ERROR }
fakeTrace.commit({ _, key -> key != fake }, true) fakeTrace.commit({ _, key -> key != fake }, true)
} }
val resolutionResults = result.second val resolutionResults = result.second
if (errorIsMissing) { if (reportIsMissingError) {
val diagnostic = when (callKind) { val diagnostic = when (callKind) {
FakeCallKind.ITERATOR -> Errors.ITERATOR_MISSING.on(reportErrorsOn) FakeCallKind.ITERATOR -> Errors.ITERATOR_MISSING.on(reportErrorsOn)
FakeCallKind.COMPONENT -> if (receiver != null) Errors.COMPONENT_FUNCTION_MISSING.on(reportErrorsOn, name, receiver.type) else null FakeCallKind.COMPONENT -> if (receiver != null) Errors.COMPONENT_FUNCTION_MISSING.on(reportErrorsOn, name, receiver.type) else null
@@ -82,49 +82,47 @@ class FakeCallResolver(
return resolutionResults return resolutionResults
} }
private fun createTracingStrategyForComponentCall( private class TracingStrategyForComponentCall(
fakeExpression: KtReferenceExpression, fakeExpression: KtReferenceExpression,
reportErrorsOn: KtExpression, val reportErrorsOn: KtExpression,
name: Name, val name: Name,
call: Call val call: Call
): TracingStrategy { ) : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) {
return object : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) {
override fun <D : CallableDescriptor?> ambiguity(trace: BindingTrace, descriptors: MutableCollection<out ResolvedCall<D>>) {
trace.report(Errors.COMPONENT_FUNCTION_AMBIGUITY.on(reportErrorsOn, name, descriptors))
}
override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) { override fun <D : CallableDescriptor?> ambiguity(trace: BindingTrace, descriptors: Collection<ResolvedCall<D>>) {
trace.report(Errors.COMPONENT_FUNCTION_ON_NULLABLE.on(reportErrorsOn, name)) trace.report(Errors.COMPONENT_FUNCTION_AMBIGUITY.on(reportErrorsOn, name, descriptors))
} }
override fun typeInferenceFailed(context: ResolutionContext<*>, inferenceErrorData: InferenceErrorData) { override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) {
val diagnostic = AbstractTracingStrategy.typeInferenceFailedDiagnostic(context, inferenceErrorData, reportErrorsOn, call) trace.report(Errors.COMPONENT_FUNCTION_ON_NULLABLE.on(reportErrorsOn, name))
if (diagnostic != null) { }
context.trace.report(diagnostic)
} override fun typeInferenceFailed(context: ResolutionContext<*>, inferenceErrorData: InferenceErrorData) {
val diagnostic = AbstractTracingStrategy.typeInferenceFailedDiagnostic(context, inferenceErrorData, reportErrorsOn, call)
if (diagnostic != null) {
context.trace.report(diagnostic)
} }
} }
} }
private fun createTracingStrategyForIteratorCall( private class TracingStrategyForIteratorCall(
fakeExpression: KtReferenceExpression, fakeExpression: KtReferenceExpression,
reportErrorsOn: KtExpression, val reportErrorsOn: KtExpression,
call: Call val call: Call
): TracingStrategy { ) : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) {
return object : TracingStrategy by TracingStrategyImpl.create(fakeExpression, call) {
override fun <D : CallableDescriptor?> ambiguity(trace: BindingTrace, descriptors: MutableCollection<out ResolvedCall<D>>) {
trace.report(Errors.ITERATOR_AMBIGUITY.on(reportErrorsOn, descriptors))
}
override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) { override fun <D : CallableDescriptor?> ambiguity(trace: BindingTrace, descriptors: Collection<ResolvedCall<D>>) {
trace.report(Errors.ITERATOR_ON_NULLABLE.on(reportErrorsOn)) trace.report(Errors.ITERATOR_AMBIGUITY.on(reportErrorsOn, descriptors))
} }
override fun typeInferenceFailed(context: ResolutionContext<*>, inferenceErrorData: InferenceErrorData) { override fun unsafeCall(trace: BindingTrace, type: KotlinType, isCallForImplicitInvoke: Boolean) {
val diagnostic = AbstractTracingStrategy.typeInferenceFailedDiagnostic(context, inferenceErrorData, reportErrorsOn, call) trace.report(Errors.ITERATOR_ON_NULLABLE.on(reportErrorsOn))
if (diagnostic != null) { }
context.trace.report(diagnostic)
} override fun typeInferenceFailed(context: ResolutionContext<*>, inferenceErrorData: InferenceErrorData) {
val diagnostic = AbstractTracingStrategy.typeInferenceFailedDiagnostic(context, inferenceErrorData, reportErrorsOn, call)
if (diagnostic != null) {
context.trace.report(diagnostic)
} }
} }
} }
@@ -143,8 +141,8 @@ class FakeCallResolver(
val call = CallMaker.makeCallWithExpressions(callElement, receiver, null, fakeCalleeExpression, valueArguments) val call = CallMaker.makeCallWithExpressions(callElement, receiver, null, fakeCalleeExpression, valueArguments)
val tracingStrategy = when (realExpression?.callKind) { val tracingStrategy = when (realExpression?.callKind) {
FakeCallKind.ITERATOR -> createTracingStrategyForIteratorCall(fakeCalleeExpression, realExpression.expression, call) FakeCallKind.ITERATOR -> TracingStrategyForIteratorCall(fakeCalleeExpression, realExpression.expressionToReportErrorsOn, call)
FakeCallKind.COMPONENT -> createTracingStrategyForComponentCall(fakeCalleeExpression, realExpression.expression, name, call) FakeCallKind.COMPONENT -> TracingStrategyForComponentCall(fakeCalleeExpression, realExpression.expressionToReportErrorsOn, name, call)
else -> null else -> null
} }
@@ -158,5 +156,5 @@ class FakeCallResolver(
return Pair(call, results) return Pair(call, results)
} }
class RealExpression(val expression: KtExpression, val callKind: FakeCallKind) class RealExpression(val expressionToReportErrorsOn: KtExpression, val callKind: FakeCallKind)
} }