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

Create from usage: Fixed extra type options.

Browse Source
This commit is contained in:
Jack Zhou
2013-04-21 17:44:31 -04:00
parent 7a42ca211d
commit 3d120432c5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+4 -2
View File
@@ -179,7 +179,9 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
if (isType()) { if (isType()) {
assert type != null : "!isType() means type == null && expressionOfType != null"; assert type != null : "!isType() means type == null && expressionOfType != null";
types.add(type); types.add(type);
types.addAll(TypeUtils.getAllSupertypes(type)); if (variance == Variance.IN_VARIANCE) {
types.addAll(TypeUtils.getAllSupertypes(type));
}
} else { } else {
assert expressionOfType != null : "!isType() means type == null && expressionOfType != null"; assert expressionOfType != null : "!isType() means type == null && expressionOfType != null";
for (JetType type : guessTypeForExpression(expressionOfType, context)) { for (JetType type : guessTypeForExpression(expressionOfType, context)) {
@@ -1044,7 +1046,7 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
List<String> arguments = new ArrayList<String>(); List<String> arguments = new ArrayList<String>();
for (TypeProjection projection : projections) { for (TypeProjection projection : projections) {
arguments.add(renderTypeLong(projection.getType(), typeParameterNameMap)); arguments.add(renderType(projection.getType(), typeParameterNameMap, fq));
} }
return renderDescriptor(declarationDescriptor, typeParameterNameMap, fq) + "<" + StringUtil.join(arguments, ", ") + ">"; return renderDescriptor(declarationDescriptor, typeParameterNameMap, fq) + "<" + StringUtil.join(arguments, ", ") + ">";
} }