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

disable assign param to field (IDEA-173747; IDEA-173689)

Browse Source 
inapplicable types or already assigned
This commit is contained in:
Anna Kozlova
2017-06-05 19:44:50 +03:00
parent a5501a81c0
commit c578a4ede7
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java
View File

@@ -46,7 +46,7 @@ public class AssignFieldFromParameterAction extends BaseIntentionAction {
return false;
}
final PsiField field = findFieldToAssign(project, myParameter);
if (field == null) return false;
if (field == null || type == null || !field.getType().isAssignableFrom(type)) return false;
if (!field.getLanguage().isKindOf(JavaLanguage.INSTANCE)) return false;
setText(CodeInsightBundle.message("intention.assign.field.from.parameter.text", field.getName()));

6
java/java-impl/src/com/intellij/codeInsight/intention/impl/FieldFromParameterUtils.java
View File

@@ -112,9 +112,9 @@ public final class FieldFromParameterUtils {
for (PsiReference reference : ReferencesSearch.search(parameter, new LocalSearchScope(parameter.getDeclarationScope()), false)) {
if (!(reference instanceof PsiReferenceExpression)) continue;
final PsiReferenceExpression expression = (PsiReferenceExpression)reference;
if (!(expression.getParent() instanceof PsiAssignmentExpression)) continue;
final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expression.getParent();
if (assignmentExpression.getRExpression() != expression) continue;
PsiAssignmentExpression assignmentExpression = PsiTreeUtil.getParentOfType(expression, PsiAssignmentExpression.class, true, PsiClass.class);
if (assignmentExpression == null) continue;
if (!PsiTreeUtil.isAncestor(assignmentExpression.getRExpression(), expression, false)) continue;
final PsiExpression lExpression = assignmentExpression.getLExpression();
if (!(lExpression instanceof PsiReferenceExpression)) continue;
final PsiElement element = ((PsiReferenceExpression)lExpression).resolve();

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/assignFieldFromParameter/beforeAlreadyAssigned.java Normal file
View File

@@ -0,0 +1,10 @@
// "Assign Parameter to Field 'myA'" "false"
class Person {
int myA;
int myId;
void f(int <caret>a, String id) {
this.myA = foo(a);
}
int foo(int a) {return a;}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/assignFieldFromParameter/beforeCheckAssignability.java Normal file
View File

@@ -0,0 +1,10 @@
// "Assign Parameter to Field 'myId'" "false"
class Person {
int a;
int myId;
void f(int a, String id<caret>) {
this.a = foo(a);
}
int foo(int a) {return a;}
}