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

StreamToLoopInspection: reuse final variable as non-final (removing "final" keyword) (IDEA-CR-17006)

Browse Source
This commit is contained in:
Tagir Valeev
2016-12-30 15:09:55 +07:00
parent a613a9253d
commit 5e742cdfac
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamToLoop/StreamToLoopInspection.java
+7 -3
View File
@@ -479,6 +479,12 @@ public class StreamToLoopInspection extends BaseJavaBatchLocalInspectionTool {
if(declaration.getDeclaredElements().length == 1) {
myPlaceholder = declaration;
PsiVariable copy = (PsiVariable)var.copy();
if (kind == ResultKind.NON_FINAL) {
PsiModifierList modifierList = copy.getModifierList();
if (modifierList != null) {
modifierList.setModifierProperty(PsiModifier.FINAL, false);
}
}
PsiExpression oldInitializer = copy.getInitializer();
LOG.assertTrue(oldInitializer != null);
oldInitializer.replace(createExpression(initializer));
@@ -498,9 +504,7 @@ public class StreamToLoopInspection extends BaseJavaBatchLocalInspectionTool {
@Contract("null -> false")
private static boolean canUseAsNonFinal(PsiVariable var) {
if(!(var instanceof PsiLocalVariable) || var.hasModifierProperty(PsiModifier.FINAL)) {
return false;
}
if (!(var instanceof PsiLocalVariable)) return false;
PsiElement block = PsiUtil.getVariableCodeBlock(var, null);
return block != null && ReferencesSearch.search(var).forEach(ref -> {
PsiElement context = PsiTreeUtil.getParentOfType(ref.getElement(), PsiClass.class, PsiLambdaExpression.class);
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterFindFirstAssignFinal.java
+3 -5
View File
@@ -4,16 +4,14 @@ import java.util.List;
public class Main {
public void test(List<String> list) {
// Cannot reuse the variable as user explicitly marked it as final
String found = "";
String res = "";
for (String s : list) {
String trim = s.trim();
if (!trim.isEmpty()) {
found = trim;
res = trim;
break;
}
}
final String res = found;
System.out.println(res);
System.out.println(res);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeFindFirstAssignFinal.java
-1
View File
@@ -4,7 +4,6 @@ import java.util.List;
public class Main {
public void test(List<String> list) {
// Cannot reuse the variable as user explicitly marked it as final
final String res = list.stream().map(String::trim).filter(trim -> !trim.isEmpty()).fi<caret>ndFirst().orElse("");
System.out.println(res);
}