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

refactor after review IDEA-CR-33048

Browse Source
This commit is contained in:
Anna Kozlova
2018-05-30 16:31:02 +03:00
parent a97212d845
commit f1862f7e01
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java
+1 -15
View File
@@ -117,12 +117,7 @@ public abstract class BaseConvertToLocalQuickFix<V extends PsiVariable> implemen
variable,
refsSet,
delete,
declaration -> {
if (!mayBeFinal(firstElement, references)) {
PsiUtil.setModifierProperty((PsiModifierListOwner)declaration.getDeclaredElements()[0], PsiModifier.FINAL, false);
}
return anchor.replace(declaration);
}
declaration -> anchor.replace(declaration)
);
}
@@ -219,15 +214,6 @@ public abstract class BaseConvertToLocalQuickFix<V extends PsiVariable> implemen
@NotNull
protected abstract String suggestLocalName(@NotNull Project project, @NotNull V variable, @NotNull PsiCodeBlock scope);
private static boolean mayBeFinal(PsiElement firstElement, @NotNull Collection<PsiReference> references) {
for (PsiReference reference : references) {
final PsiElement element = reference.getElement();
if (element == firstElement) continue;
if (element instanceof PsiExpression && PsiUtil.isAccessedForWriting((PsiExpression)element)) return false;
}
return true;
}
private static void retargetReferences(PsiElementFactory elementFactory, String localName, Collection<PsiReference> refs)
throws IncorrectOperationException {
final PsiReferenceExpression refExpr = (PsiReferenceExpression)elementFactory.createExpressionFromText(localName, null);
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterAssignmentAndFinalByDefault.java
+2 -2
View File
@@ -2,8 +2,8 @@
class Test {
int getFoo1() {
int myFoo = 1;
myFoo = 5;
int myFoo;
while (true) myFoo = 1;
return myFoo;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeAssignmentAndFinalByDefault.java
+1 -2
View File
@@ -3,8 +3,7 @@ class Test {
private int my<caret>Foo;
int getFoo1() {
myFoo = 1;
myFoo = 5;
while (true) myFoo = 1;
return myFoo;
}
}