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

extracted method usage

Browse Source
This commit is contained in:
Svetlana Isakova
2012-11-20 17:43:32 +04:00
parent 39450dd954
commit 7773f713b7
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java
+1 -1
View File
@@ -199,7 +199,7 @@ public class ArgumentTypeResolver {
} }
@Nullable @Nullable
private JetType resolveTypeRefWithDefault( public JetType resolveTypeRefWithDefault(
@Nullable JetTypeReference returnTypeRef, @Nullable JetTypeReference returnTypeRef,
@NotNull JetScope scope, @NotNull JetScope scope,
@NotNull BindingTrace trace, @NotNull BindingTrace trace,
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+2 -7
View File
@@ -136,13 +136,8 @@ public class CandidateResolver {
if (projection.getProjectionKind() != JetProjectionKind.NONE) { if (projection.getProjectionKind() != JetProjectionKind.NONE) {
context.trace.report(PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT.on(projection)); context.trace.report(PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT.on(projection));
} }
JetTypeReference typeReference = projection.getTypeReference(); typeArguments.add(argumentTypeResolver.resolveTypeRefWithDefault(
if (typeReference != null) { projection.getTypeReference(), context.scope, context.trace, ErrorUtils.createErrorType("Star projection in a call")));
typeArguments.add(typeResolver.resolveType(context.scope, typeReference, context.trace, true));
}
else {
typeArguments.add(ErrorUtils.createErrorType("Star projection in a call"));
}
} }
int expectedTypeArgumentCount = candidate.getTypeParameters().size(); int expectedTypeArgumentCount = candidate.getTypeParameters().size();
if (expectedTypeArgumentCount == jetTypeArguments.size()) { if (expectedTypeArgumentCount == jetTypeArguments.size()) {