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

Problem: remove static import (temp workaround)

Browse Source
This commit is contained in:
Nikolay Krasko
2016-05-27 16:13:18 +03:00
parent bfef8726bb
commit d5ae37d33a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+8 -8
View File
@@ -60,7 +60,7 @@ import java.util.*;
import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
import static org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE; import static org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE;
import static org.jetbrains.kotlin.resolve.calls.tower.NewResolutionOldInference.ResolutionKind.*; //import static org.jetbrains.kotlin.resolve.calls.tower.NewResolutionOldInference.ResolutionKind.*;
import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
@SuppressWarnings("RedundantTypeArguments") @SuppressWarnings("RedundantTypeArguments")
@@ -128,7 +128,7 @@ public class CallResolver {
Name referencedName = nameExpression.getReferencedNameAsName(); Name referencedName = nameExpression.getReferencedNameAsName();
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
context, referencedName, nameExpression, context, referencedName, nameExpression,
Variable.INSTANCE); NewResolutionOldInference.ResolutionKind.Variable.INSTANCE);
} }
@NotNull @NotNull
@@ -138,7 +138,7 @@ public class CallResolver {
) { ) {
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
context, nameExpression.getReferencedNameAsName(), nameExpression, context, nameExpression.getReferencedNameAsName(), nameExpression,
CallableReference.INSTANCE); NewResolutionOldInference.ResolutionKind.CallableReference.INSTANCE);
} }
@NotNull @NotNull
@@ -151,7 +151,7 @@ public class CallResolver {
BasicCallResolutionContext callResolutionContext = BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS); BasicCallResolutionContext callResolutionContext = BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS);
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
callResolutionContext, name, functionReference, callResolutionContext, name, functionReference,
Function.INSTANCE); NewResolutionOldInference.ResolutionKind.Function.INSTANCE);
} }
@NotNull @NotNull
@@ -161,7 +161,7 @@ public class CallResolver {
) { ) {
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
context, OperatorNameConventions.INVOKE, tracing, context, OperatorNameConventions.INVOKE, tracing,
Invoke.INSTANCE); NewResolutionOldInference.ResolutionKind.Invoke.INSTANCE);
} }
@NotNull @NotNull
@@ -262,7 +262,7 @@ public class CallResolver {
KtArrayAccessExpression arrayAccessExpression = (KtArrayAccessExpression) context.call.getCallElement(); KtArrayAccessExpression arrayAccessExpression = (KtArrayAccessExpression) context.call.getCallElement();
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
context, name, arrayAccessExpression, context, name, arrayAccessExpression,
Function.INSTANCE); NewResolutionOldInference.ResolutionKind.Function.INSTANCE);
} }
KtExpression calleeExpression = context.call.getCalleeExpression(); KtExpression calleeExpression = context.call.getCalleeExpression();
@@ -270,7 +270,7 @@ public class CallResolver {
KtSimpleNameExpression expression = (KtSimpleNameExpression) calleeExpression; KtSimpleNameExpression expression = (KtSimpleNameExpression) calleeExpression;
return computeTasksAndResolveCall( return computeTasksAndResolveCall(
context, expression.getReferencedNameAsName(), expression, context, expression.getReferencedNameAsName(), expression,
Function.INSTANCE); NewResolutionOldInference.ResolutionKind.Function.INSTANCE);
} }
else if (calleeExpression instanceof KtConstructorCalleeExpression) { else if (calleeExpression instanceof KtConstructorCalleeExpression) {
return (OverloadResolutionResults) resolveCallForConstructor(context, (KtConstructorCalleeExpression) calleeExpression); return (OverloadResolutionResults) resolveCallForConstructor(context, (KtConstructorCalleeExpression) calleeExpression);
@@ -599,7 +599,7 @@ public class CallResolver {
} }
} }
if (!(resolutionTask.resolutionKind instanceof GivenCandidates)) { if (!(resolutionTask.resolutionKind instanceof NewResolutionOldInference.ResolutionKind.GivenCandidates)) {
assert resolutionTask.name != null; assert resolutionTask.name != null;
return newCallResolver.runResolution(context, resolutionTask.name, resolutionTask.resolutionKind, tracing); return newCallResolver.runResolution(context, resolutionTask.name, resolutionTask.resolutionKind, tracing);
} }