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

refactoring: warnings eliminated

Browse Source
This commit is contained in:
svtk
2013-10-30 20:56:35 +04:00
parent 3c04b87f1a
commit f7be8ce953
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java
+1
View File
@@ -63,6 +63,7 @@ import static org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionRes
import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER;
import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE;
@SuppressWarnings("RedundantTypeArguments")
public class CallResolver { public class CallResolver {
@NotNull @NotNull
private ExpressionTypingServices expressionTypingServices; private ExpressionTypingServices expressionTypingServices;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+4 -5
View File
@@ -430,7 +430,7 @@ public class CandidateResolver {
}, null); }, null);
} }
private boolean isFairSafeCallExpression(@NotNull JetExpression expression, @NotNull BindingTrace trace) { private static boolean isFairSafeCallExpression(@NotNull JetExpression expression, @NotNull BindingTrace trace) {
// We are interested in type of the last call: // We are interested in type of the last call:
// 'a.b?.foo()' is safe call, but 'a?.b.foo()' is not. // 'a.b?.foo()' is safe call, but 'a?.b.foo()' is not.
// Since receiver is 'a.b' and selector is 'foo()', // Since receiver is 'a.b' and selector is 'foo()',
@@ -443,7 +443,7 @@ public class CandidateResolver {
return type != null && type.isNullable(); return type != null && type.isNullable();
} }
private <D extends CallableDescriptor> void checkResultArgumentType( private static <D extends CallableDescriptor> void checkResultArgumentType(
@Nullable JetType type, @Nullable JetType type,
@NotNull ValueArgument argument, @NotNull ValueArgument argument,
@NotNull CallCandidateResolutionContext<D> context @NotNull CallCandidateResolutionContext<D> context
@@ -669,15 +669,14 @@ public class CandidateResolver {
ValueArgumentsCheckingResult checkingResult = checkValueArgumentTypes( ValueArgumentsCheckingResult checkingResult = checkValueArgumentTypes(
context, context.candidateCall, trace, resolveFunctionArgumentBodies); context, context.candidateCall, trace, resolveFunctionArgumentBodies);
ResolutionStatus resultStatus = checkingResult.status; ResolutionStatus resultStatus = checkingResult.status;
resultStatus = resultStatus.combine(checkReceiver(context, trace, false)); resultStatus = resultStatus.combine(checkReceiver(context, trace));
return new ValueArgumentsCheckingResult(resultStatus, checkingResult.argumentTypes); return new ValueArgumentsCheckingResult(resultStatus, checkingResult.argumentTypes);
} }
private static <D extends CallableDescriptor> ResolutionStatus checkReceiver( private static <D extends CallableDescriptor> ResolutionStatus checkReceiver(
@NotNull CallCandidateResolutionContext<D> context, @NotNull CallCandidateResolutionContext<D> context,
@NotNull BindingTrace trace, @NotNull BindingTrace trace
boolean checkOnlyReceiverTypeError
) { ) {
ResolutionStatus resultStatus = SUCCESS; ResolutionStatus resultStatus = SUCCESS;
ResolvedCall<D> candidateCall = context.candidateCall; ResolvedCall<D> candidateCall = context.candidateCall;