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

Create from usage: Fixed return type's type parameters not being taken into account.

Browse Source
This commit is contained in:
Jack Zhou
2013-04-08 21:49:57 -04:00
parent 197000b8ce
commit 0d36ae7f01
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+21 -4
View File
@@ -328,6 +328,13 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
Collections.addAll(typeParameterNames, names); Collections.addAll(typeParameterNames, names);
} }
} }
JetTypeReference returnTypeRef = func.getReturnTypeRef();
if (returnTypeRef != null) {
String[] names = typeParameterMap.get(returnTypeRef.getText());
if (names != null) {
Collections.addAll(typeParameterNames, names);
}
}
return typeParameterNames.isEmpty() return typeParameterNames.isEmpty()
? new TextResult("") ? new TextResult("")
@@ -438,9 +445,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
caretModel.moveToOffset(file.getNode().getStartOffset()); caretModel.moveToOffset(file.getNode().getStartOffset());
TemplateBuilderImpl builder = new TemplateBuilderImpl(file); TemplateBuilderImpl builder = new TemplateBuilderImpl(file);
if (!isUnit) { TypeExpression returnTypeExpression = isUnit ? null : setupReturnTypeTemplate(builder, func, returnType);
setupReturnTypeTemplate(builder, func, returnType);
}
TypeExpression[] parameterTypeExpressions = setupParameterTypeTemplates(project, builder, parameters, parameterList); TypeExpression[] parameterTypeExpressions = setupParameterTypeTemplates(project, builder, parameters, parameterList);
// add a segment for the parameter list // add a segment for the parameter list
@@ -449,7 +454,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
// parameter list as the user makes selections in the parameter types, and we need alwaysStopAt to be false so the user can't tab to // parameter list as the user makes selections in the parameter types, and we need alwaysStopAt to be false so the user can't tab to
// it. // it.
JetScope scope = getScope(owner, context); JetScope scope = getScope(owner, context);
TypeParameterListExpression expression = setupTypeParameterListTemplate(builder, func, ownerType, parameterTypeExpressions, scope); TypeParameterListExpression expression = setupTypeParameterListTemplate(builder, func, ownerType, parameterTypeExpressions, returnTypeExpression, scope);
// the template built by TemplateBuilderImpl is ordered by element position, but we want types to be first, so hack it // the template built by TemplateBuilderImpl is ordered by element position, but we want types to be first, so hack it
final TemplateImpl template = (TemplateImpl) builder.buildInlineTemplate(); final TemplateImpl template = (TemplateImpl) builder.buildInlineTemplate();
@@ -526,6 +531,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
@NotNull JetNamedFunction func, @NotNull JetNamedFunction func,
@NotNull JetType ownerType, @NotNull JetType ownerType,
@NotNull TypeExpression[] parameterTypeExpressions, @NotNull TypeExpression[] parameterTypeExpressions,
@Nullable TypeExpression returnTypeExpression,
@NotNull JetScope scope @NotNull JetScope scope
) { ) {
Map<String, String[]> typeParameterMap = new HashMap<String, String[]>(); Map<String, String[]> typeParameterMap = new HashMap<String, String[]>();
@@ -541,6 +547,17 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
} }
} }
JetTypeReference returnTypeRef = func.getReturnTypeRef();
if (returnTypeRef != null) {
JetType[] returnTypeOptions = returnTypeExpression.getOptions();
String[] returnTypeOptionStrings = returnTypeExpression.getOptionStrings();
assert returnTypeOptions.length == returnTypeOptionStrings.length;
for (int i = 0; i < returnTypeOptions.length; i++) {
Set<TypeParameterDescriptor> typeParameters = getTypeParametersInType(returnTypeOptions[i]);
typeParameterMap.put(returnTypeOptionStrings[i], getTypeParameterNamesNotInScope(typeParameters, scope));
}
}
builder.replaceElement(func, TextRange.create(3, 3), TYPE_PARAMETER_LIST_VARIABLE_NAME, null, false); // ((3, 3) is after "fun") builder.replaceElement(func, TextRange.create(3, 3), TYPE_PARAMETER_LIST_VARIABLE_NAME, null, false); // ((3, 3) is after "fun")
return new TypeParameterListExpression(ownerTypeParameterNames, typeParameterMap); return new TypeParameterListExpression(ownerTypeParameterNames, typeParameterMap);
} }