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

Minor. Drop unused method

Browse Source
This commit is contained in:
Denis Zharkov
2017-10-03 19:36:01 +03:00
parent 457b57ace2
commit 9fdb702688
2 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java
+3 -20
View File
@@ -59,7 +59,6 @@ import java.util.List;
import static org.jetbrains.kotlin.psi.KtPsiUtil.getLastElementDeparenthesized; import static org.jetbrains.kotlin.psi.KtPsiUtil.getLastElementDeparenthesized;
import static org.jetbrains.kotlin.resolve.BindingContextUtils.getRecordedTypeInfo; import static org.jetbrains.kotlin.resolve.BindingContextUtils.getRecordedTypeInfo;
import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS;
import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS;
import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.DEPENDENT; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.DEPENDENT;
import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT;
@@ -109,13 +108,8 @@ public class ArgumentTypeResolver {
return KotlinTypeChecker.DEFAULT.isSubtypeOf(actualType, expectedType); return KotlinTypeChecker.DEFAULT.isSubtypeOf(actualType, expectedType);
} }
public void checkTypesWithNoCallee(@NotNull CallResolutionContext<?> context) {
checkTypesWithNoCallee(context, SHAPE_FUNCTION_ARGUMENTS);
}
public void checkTypesWithNoCallee( public void checkTypesWithNoCallee(
@NotNull CallResolutionContext<?> context, @NotNull CallResolutionContext<?> context
@NotNull ResolveArgumentsMode resolveFunctionArgumentBodies
) { ) {
if (context.checkArguments != CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) return; if (context.checkArguments != CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) return;
@@ -126,9 +120,7 @@ public class ArgumentTypeResolver {
} }
} }
if (resolveFunctionArgumentBodies == RESOLVE_FUNCTION_ARGUMENTS) { checkTypesForFunctionArgumentsWithNoCallee(context);
checkTypesForFunctionArgumentsWithNoCallee(context);
}
for (KtTypeProjection typeProjection : context.call.getTypeArguments()) { for (KtTypeProjection typeProjection : context.call.getTypeArguments()) {
KtTypeReference typeReference = typeProjection.getTypeReference(); KtTypeReference typeReference = typeProjection.getTypeReference();
@@ -141,7 +133,7 @@ public class ArgumentTypeResolver {
} }
} }
public void checkTypesForFunctionArgumentsWithNoCallee(@NotNull CallResolutionContext<?> context) { private void checkTypesForFunctionArgumentsWithNoCallee(@NotNull CallResolutionContext<?> context) {
if (context.checkArguments != CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) return; if (context.checkArguments != CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) return;
for (ValueArgument valueArgument : context.call.getValueArguments()) { for (ValueArgument valueArgument : context.call.getValueArguments()) {
@@ -175,15 +167,6 @@ public class ArgumentTypeResolver {
return isFunctionLiteralArgument(expression, context) || isCallableReferenceArgument(expression, context); return isFunctionLiteralArgument(expression, context) || isCallableReferenceArgument(expression, context);
} }
@NotNull
public static KtFunction getFunctionLiteralArgument(
@NotNull KtExpression expression, @NotNull ResolutionContext context
) {
assert isFunctionLiteralArgument(expression, context);
//noinspection ConstantConditions
return getFunctionLiteralArgumentIfAny(expression, context);
}
@Nullable @Nullable
public static KtFunction getFunctionLiteralArgumentIfAny( public static KtFunction getFunctionLiteralArgumentIfAny(
@NotNull KtExpression expression, @NotNull ResolutionContext context @NotNull KtExpression expression, @NotNull ResolutionContext context
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java
+2 -3
View File
@@ -62,7 +62,6 @@ import javax.inject.Inject;
import java.util.*; 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.results.OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE; import static org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults.Code.INCOMPLETE_TYPE_INFERENCE;
import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
@@ -621,7 +620,7 @@ public class CallResolver {
if (CallResolverUtilKt.isInvokeCallOnVariable(context.call)) return; if (CallResolverUtilKt.isInvokeCallOnVariable(context.call)) return;
if (!results.isSingleResult()) { if (!results.isSingleResult()) {
if (results.getResultCode() == INCOMPLETE_TYPE_INFERENCE) { if (results.getResultCode() == INCOMPLETE_TYPE_INFERENCE) {
argumentTypeResolver.checkTypesWithNoCallee(context, RESOLVE_FUNCTION_ARGUMENTS); argumentTypeResolver.checkTypesWithNoCallee(context);
} }
return; return;
} }
@@ -648,7 +647,7 @@ public class CallResolver {
} }
private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> checkArgumentTypesAndFail(BasicCallResolutionContext context) { private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> checkArgumentTypesAndFail(BasicCallResolutionContext context) {
argumentTypeResolver.checkTypesWithNoCallee(context, ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS); argumentTypeResolver.checkTypesWithNoCallee(context);
return OverloadResolutionResultsImpl.nameNotFound(); return OverloadResolutionResultsImpl.nameNotFound();
} }