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

Create from usage: Changed type order to prefer substituted versions.

Browse Source
This commit is contained in:
Jack Zhou
2013-04-21 16:56:11 -04:00
parent 0e73e32621
commit 7a42ca211d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+8 -9
View File
@@ -174,8 +174,8 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
} }
@NotNull @NotNull
private Collection<JetType> getPossibleTypes(BindingContext context) { private List<JetType> getPossibleTypes(BindingContext context) {
Collection<JetType> types = new ArrayList<JetType>(); List<JetType> types = new ArrayList<JetType>();
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);
@@ -208,7 +208,8 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
@NotNull TypeSubstitution[] substitutions, @NotNull TypeSubstitution[] substitutions,
@NotNull JetScope scope @NotNull JetScope scope
) { ) {
Collection<JetType> types = getPossibleTypes(context); List<JetType> types = getPossibleTypes(context);
Collections.reverse(types); // reverse and reverse back later, so that things added below are added at the front
Set<JetType> newTypes = new LinkedHashSet<JetType>(types); Set<JetType> newTypes = new LinkedHashSet<JetType>(types);
for (TypeSubstitution substitution : substitutions) { // each substitution can be applied or not, so we offer all options for (TypeSubstitution substitution : substitutions) { // each substitution can be applied or not, so we offer all options
@@ -229,13 +230,11 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
newTypes.add(KotlinBuiltIns.getInstance().getAnyType()); newTypes.add(KotlinBuiltIns.getInstance().getAnyType());
} }
types = newTypes; typeCandidates = new TypeCandidate[newTypes.size()];
int i = typeCandidates.length - 1; // reverse order (see explanation above)
typeCandidates = new TypeCandidate[types.size()]; for (JetType type : newTypes) {
int i = 0;
for (JetType type : types) {
typeCandidates[i] = new TypeCandidate(type, scope); typeCandidates[i] = new TypeCandidate(type, scope);
i++; i--;
} }
} }