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

Create from usage: Fixed a bug with creating methods in the wrong owners for next and hasNext.

Browse Source
This commit is contained in:
Jack Zhou
2013-04-21 18:02:57 -04:00
parent 3d120432c5
commit 60fa732042
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateMethodFromUsageFix.java
+19 -8
View File
@@ -153,6 +153,10 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
this(expressionOfType, null, variance); this(expressionOfType, null, variance);
} }
public TypeOrExpressionThereof(@NotNull JetType type) {
this(type, Variance.IN_VARIANCE);
}
public TypeOrExpressionThereof(@NotNull JetType type, Variance variance) { public TypeOrExpressionThereof(@NotNull JetType type, Variance variance) {
this(null, type, variance); this(null, type, variance);
} }
@@ -1262,13 +1266,17 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
@Nullable @Nullable
@Override @Override
public IntentionAction createAction(Diagnostic diagnostic) { public IntentionAction createAction(Diagnostic diagnostic) {
assert diagnostic.getFactory() == Errors.HAS_NEXT_MISSING ||
diagnostic.getFactory() == Errors.HAS_NEXT_FUNCTION_NONE_APPLICABLE;
@SuppressWarnings("unchecked")
DiagnosticWithParameters1<JetExpression, JetType> diagnosticWithParameters =
(DiagnosticWithParameters1<JetExpression, JetType>) diagnostic;
TypeOrExpressionThereof ownerType = new TypeOrExpressionThereof(diagnosticWithParameters.getA());
JetForExpression forExpr = QuickFixUtil.getParentElementOfType(diagnostic, JetForExpression.class); JetForExpression forExpr = QuickFixUtil.getParentElementOfType(diagnostic, JetForExpression.class);
if (forExpr == null) return null; if (forExpr == null) return null;
JetExpression iterableExpr = forExpr.getLoopRange();
if (iterableExpr == null) return null;
TypeOrExpressionThereof iterableType = new TypeOrExpressionThereof(iterableExpr);
TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(KotlinBuiltIns.getInstance().getBooleanType(), Variance.OUT_VARIANCE); TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(KotlinBuiltIns.getInstance().getBooleanType(), Variance.OUT_VARIANCE);
return new CreateMethodFromUsageFix(forExpr, iterableType, "hasNext", returnType, new ArrayList<Parameter>()); return new CreateMethodFromUsageFix(forExpr, ownerType, "hasNext", returnType, new ArrayList<Parameter>());
} }
}; };
} }
@@ -1279,15 +1287,18 @@ public class CreateMethodFromUsageFix extends CreateFromUsageFixBase {
@Nullable @Nullable
@Override @Override
public IntentionAction createAction(Diagnostic diagnostic) { public IntentionAction createAction(Diagnostic diagnostic) {
assert diagnostic.getFactory() == Errors.NEXT_MISSING || diagnostic.getFactory() == Errors.NEXT_NONE_APPLICABLE;
@SuppressWarnings("unchecked")
DiagnosticWithParameters1<JetExpression, JetType> diagnosticWithParameters =
(DiagnosticWithParameters1<JetExpression, JetType>) diagnostic;
TypeOrExpressionThereof ownerType = new TypeOrExpressionThereof(diagnosticWithParameters.getA());
JetForExpression forExpr = QuickFixUtil.getParentElementOfType(diagnostic, JetForExpression.class); JetForExpression forExpr = QuickFixUtil.getParentElementOfType(diagnostic, JetForExpression.class);
if (forExpr == null) return null; if (forExpr == null) return null;
JetExpression iterableExpr = forExpr.getLoopRange();
if (iterableExpr == null) return null;
JetExpression variableExpr = forExpr.getLoopParameter(); JetExpression variableExpr = forExpr.getLoopParameter();
if (variableExpr == null) return null; if (variableExpr == null) return null;
TypeOrExpressionThereof iterableType = new TypeOrExpressionThereof(iterableExpr);
TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(variableExpr, Variance.OUT_VARIANCE); TypeOrExpressionThereof returnType = new TypeOrExpressionThereof(variableExpr, Variance.OUT_VARIANCE);
return new CreateMethodFromUsageFix(forExpr, iterableType, "next", returnType, new ArrayList<Parameter>()); return new CreateMethodFromUsageFix(forExpr, ownerType, "next", returnType, new ArrayList<Parameter>());
} }
}; };
} }