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

Java: create final local variable when configured (IDEA-366908)

Browse Source 
for the "Convert to local" quick-fix of the "Field can be local" inspection

GitOrigin-RevId: f82f38ca4c6eda299519eef80e6a90aa8d4b2f68
This commit is contained in:
Bas Leijdekkers
2025-02-03 20:43:02 +00:00
committed by intellij-monorepo-bot
parent 248f8c875a
commit 9e54c0017f
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-inspections/src/com/intellij/codeInspection/varScopeCanBeNarrowed/ConvertToLocalUtils.java
+10 -12
View File
@@ -5,7 +5,6 @@ import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.CommonJavaInlineUtil;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.VariableAccessUtils;
import org.jetbrains.annotations.NotNull;
@@ -27,21 +26,20 @@ final class ConvertToLocalUtils {
if (anchorBlock == null) return null; // was assertion, but need to fix the case when obsolete inspection highlighting is left
final PsiElement firstElement = getLowestOffsetElement(references);
final String localName = newName.apply(anchorBlock);
if (firstElement == null) return null;
final PsiElement anchor = getAnchorElement(anchorBlock, firstElement);
if (anchor == null) return null;
final PsiAssignmentExpression anchorAssignmentExpression = searchAssignmentExpression(anchor);
final PsiExpression initializer;
if (anchorAssignmentExpression != null && isVariableAssignment(anchorAssignmentExpression, variable)) {
initializer = anchorAssignmentExpression.getRExpression();
}
else {
initializer = variable.getInitializer();
}
final PsiExpression initializer = anchorAssignmentExpression != null && isVariableAssignment(anchorAssignmentExpression, variable)
? anchorAssignmentExpression.getRExpression()
: variable.getInitializer();
final PsiElementFactory psiFactory = JavaPsiFacade.getElementFactory(variable.getProject());
final PsiDeclarationStatement declaration = psiFactory.createVariableDeclarationStatement(localName, variable.getType(), initializer);
if (ContainerUtil.exists(references, PsiUtil::isAccessedForWriting)) {
PsiUtil.setModifierProperty((PsiLocalVariable)declaration.getDeclaredElements()[0], PsiModifier.FINAL, false);
final PsiDeclarationStatement declaration =
psiFactory.createVariableDeclarationStatement(localName, variable.getType(), initializer, variable);
for (int i = 1; i < references.size(); i++) {
if (PsiUtil.isAccessedForWriting(references.get(i))) {
PsiUtil.setModifierProperty((PsiLocalVariable)declaration.getDeclaredElements()[0], PsiModifier.FINAL, false);
break;
}
}
final PsiElement newDeclaration;
if (anchorAssignmentExpression != null && isVariableAssignment(anchorAssignmentExpression, variable)) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/afterFinalInitializer.java
+9
View File
@@ -0,0 +1,9 @@
// "Convert field to local variable in initializer section" "true-preview"
class TestInitializer {
{
final boolean field = true;
System.out.println(field);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convert2Local/beforeFinalInitializer.java
+11
View File
@@ -0,0 +1,11 @@
// "Convert field to local variable in initializer section" "true-preview"
class TestInitializer {
private boolean fie<caret>ld;
{
field = true;
System.out.println(field);
}
}