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

Renamed method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-18 18:41:43 +04:00
parent 933a455f6c
commit 526cc3ce15
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD
@NotNull List<TypeParameterDescriptor> methodTypeParameters, @NotNull List<TypeParameterDescriptor> methodTypeParameters,
@Nullable JetType returnType @Nullable JetType returnType
) { ) {
TypeSubstitutor substitutor = SignaturesUtil.createSubstitutorForFunctionTypeParameters(originalToAltTypeParameters); TypeSubstitutor substitutor = SignaturesUtil.createSubstitutorForTypeParameters(originalToAltTypeParameters);
for (ValueParameterDescriptor parameter : valueParameterDescriptors.getDescriptors()) { for (ValueParameterDescriptor parameter : valueParameterDescriptors.getDescriptors()) {
int index = parameter.getIndex(); int index = parameter.getIndex();
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+1 -1
View File
@@ -187,7 +187,7 @@ public class SignaturesPropagationData {
JetType originalReceiverType = parameters.getReceiverType(); JetType originalReceiverType = parameters.getReceiverType();
if (originalReceiverType != null) { if (originalReceiverType != null) {
JetType substituted = SignaturesUtil.createSubstitutorForFunctionTypeParameters(autoTypeParameterToModified) JetType substituted = SignaturesUtil.createSubstitutorForTypeParameters(autoTypeParameterToModified)
.substitute(originalReceiverType, INVARIANT); .substitute(originalReceiverType, INVARIANT);
assert substituted != null; assert substituted != null;
return new JavaDescriptorResolver.ValueParameterDescriptors(substituted, resultParameters); return new JavaDescriptorResolver.ValueParameterDescriptors(substituted, resultParameters);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class SignaturesUtil {
return result; return result;
} }
public static TypeSubstitutor createSubstitutorForFunctionTypeParameters( public static TypeSubstitutor createSubstitutorForTypeParameters(
@NotNull Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> originalToAltTypeParameters @NotNull Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> originalToAltTypeParameters
) { ) {
Map<TypeConstructor, TypeProjection> typeSubstitutionContext = Maps.newHashMap(); Map<TypeConstructor, TypeProjection> typeSubstitutionContext = Maps.newHashMap();