MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

DataPointHolderConversionIntention not supports fields without initializer for conflicts escapings

Browse Source
This commit is contained in:
Dmitry Batkovich
2014-06-03 19:54:46 +04:00
parent 0455ae89e2
commit af40fe88a6
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java
+8 -15
View File
@@ -92,24 +92,17 @@ public class DataPointHolderConversionIntention extends PsiElementBaseIntentionA
final PsiMethod method =
elementFactory.createMethod(codeStyleManager.variableNameToPropertyName(field.getName(), VariableKind.STATIC_FIELD), field.getType());
PsiCodeBlock body = method.getBody();
if (body == null) {
body = elementFactory.createCodeBlock();
method.add(body);
}
assert body != null;
if (!(field.getType() instanceof PsiPrimitiveType) || fieldInitializer != null) {
final PsiStatement methodCode = elementFactory
.createStatementFromText(PsiKeyword.RETURN + " " + (fieldInitializer == null ? PsiKeyword.NULL : fieldInitializer.getText()) + ";",
null);
body.add(methodCode);
}
final PsiStatement methodCode = elementFactory.createStatementFromText(PsiKeyword.RETURN + " " + fieldInitializer.getText() + ";", null);
body.add(methodCode);
return method;
}
@Override
public boolean isAvailable(@NotNull final Project project, final Editor editor, @NotNull final PsiElement element) {
final Pair<PsiMember, PsiAnnotation> dataPointsHolder = extractDataPointsHolder(element);
if (dataPointsHolder != null && isConvertibleIfMethod(dataPointsHolder.getFirst())) {
if (dataPointsHolder != null && isConvertible(dataPointsHolder.getFirst())) {
final String replaceType = dataPointsHolder.getFirst() instanceof PsiMethod ? "field" : "method";
final String annotation = StringUtil.getShortName(dataPointsHolder.getSecond().getQualifiedName());
setText(String.format(REPLACE_BY_TEMPLATE, annotation, replaceType));
@@ -131,11 +124,11 @@ public class DataPointHolderConversionIntention extends PsiElementBaseIntentionA
return annotation == null ? null : Pair.create(holder, annotation);
}
private static boolean isConvertibleIfMethod(@NotNull final PsiMember maybeMethod) {
if (!(maybeMethod instanceof PsiMethod)) {
return true;
private static boolean isConvertible(@NotNull final PsiMember member) {
if (!(member instanceof PsiMethod)) {
return ((PsiField)member).getInitializer() != null;
}
final PsiMethod method = (PsiMethod)maybeMethod;
final PsiMethod method = (PsiMethod)member;
final PsiType returnType = method.getReturnType();
if (returnType == null || returnType.equals(PsiType.VOID) || method.getParameterList().getParametersCount() != 0) {
return false;
plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/dataPointHolders/afterField.java
+1 -1
View File
@@ -3,7 +3,7 @@ class Foo {
@org.junit.experimental.theories.DataPoints
public static int[] myData() {
return null;
return new int[]{0, 1};
}
}
plugins/IntentionPowerPak/test/com/siyeh/ipp/junit/dataPointHolders/beforeField.java
+1 -1
View File
@@ -2,6 +2,6 @@
class Foo {
@org.junit.experimental.theories.DataPoints
public static int[] qweMyDa<caret>taasd;
public static int[] qweMyDa<caret>taasd = new int[] {0, 1};
}