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

[java-intentions] Fix bug in SurroundAutoCloseableAction with var variables

Browse Source 
IDEA-317852

GitOrigin-RevId: c36e4be4553ef94c5dec6977f95fb008860fd08d
This commit is contained in:
Andrey Cherkasov
2023-04-24 02:18:39 +04:00
committed by intellij-monorepo-bot
parent 4bb6243e9d
commit 31180f1fad
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java-impl/src/com/intellij/codeInsight/intention/impl/SurroundAutoCloseableAction.java
View File

@@ -139,12 +139,13 @@ public class SurroundAutoCloseableAction extends PsiElementBaseIntentionAction {
CommentTracker tracker = new CommentTracker();
String text = "try (" + variable.getTypeElement().getText() + " " + variable.getName() + " = " + tracker.text(initializer) + ") {}";
PsiTryStatement armStatement = (PsiTryStatement)tracker.replaceAndRestoreComments(declaration, text);
PsiTryStatement armStatement = (PsiTryStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText(text, declaration);
List<PsiElement> toFormat = null;
if (last != null) {
toFormat = moveStatements(last, armStatement);
toFormat = moveStatements(last, declaration, armStatement);
}
armStatement = (PsiTryStatement)tracker.replaceAndRestoreComments(declaration, armStatement);
CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
PsiElement formattedElement = codeStyleManager.reformat(armStatement);
@@ -165,16 +166,16 @@ public class SurroundAutoCloseableAction extends PsiElementBaseIntentionAction {
}
}
private static List<PsiElement> moveStatements(PsiElement last, PsiTryStatement statement) {
PsiCodeBlock tryBlock = statement.getTryBlock();
assert tryBlock != null : statement.getText();
PsiElement parent = statement.getParent();
private static List<PsiElement> moveStatements(PsiElement last, PsiElement declaration, PsiTryStatement armStatement) {
PsiCodeBlock tryBlock = armStatement.getTryBlock();
assert tryBlock != null : armStatement.getText();
PsiElement parent = declaration.getParent();
LocalSearchScope scope = new LocalSearchScope(parent);
List<PsiElement> toFormat = new SmartList<>();
PsiElement stopAt = last.getNextSibling();
PsiElement i = statement.getNextSibling();
PsiElement i = declaration.getNextSibling();
while (i != null && i != stopAt) {
PsiElement child = i;
i = PsiTreeUtil.skipWhitespacesAndCommentsForward(i);
@@ -194,12 +195,12 @@ public class SurroundAutoCloseableAction extends PsiElementBaseIntentionAction {
if (!contained) {
PsiLocalVariable var = (PsiLocalVariable)declared;
PsiElementFactory factory = JavaPsiFacade.getElementFactory(statement.getProject());
PsiElementFactory factory = JavaPsiFacade.getElementFactory(declaration.getProject());
String name = var.getName();
PsiDeclarationStatement declarationStatement = factory.createVariableDeclarationStatement(name, var.getType(), null);
PsiUtil.setModifierProperty((PsiLocalVariable)declarationStatement.getDeclaredElements()[0], PsiModifier.FINAL, var.hasModifierProperty(PsiModifier.FINAL));
toFormat.add(parent.addBefore(declarationStatement, statement));
toFormat.add(parent.addBefore(declarationStatement, declaration));
CommentTracker commentTracker = new CommentTracker();
PsiExpression varInit = var.getInitializer();
@@ -217,7 +218,7 @@ public class SurroundAutoCloseableAction extends PsiElementBaseIntentionAction {
}
}
PsiElement first = statement.getNextSibling();
PsiElement first = declaration.getNextSibling();
tryBlock.addRangeBefore(first, last, tryBlock.getRBrace());
parent.deleteChildRange(first, last);

11
java/java-tests/testData/codeInsight/surroundAutoCloseable/ImplicitlyTypedDeclaration.java Normal file
View File

@@ -0,0 +1,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLConnection;
class C {
public void read(URLConnection connection) throws IOException {
<caret>InputStream stream = connection.getInputStream();
var available = stream.available();
System.out.println(available);
}
}

13
java/java-tests/testData/codeInsight/surroundAutoCloseable/ImplicitlyTypedDeclaration_after.java Normal file
View File

@@ -0,0 +1,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLConnection;
class C {
public void read(URLConnection connection) throws IOException {
int available;
try (InputStream stream = connection.getInputStream()) {
available = stream.available();
}
System.out.println(available);
}
}

1
java/java-tests/testSrc/com/intellij/java/codeInsight/intention/SurroundAutoCloseableActionTest.java
View File

@@ -42,6 +42,7 @@ public class SurroundAutoCloseableActionTest extends LightJavaCodeInsightFixture
JavaCodeStyleSettings.getInstance(getProject()).GENERATE_FINAL_LOCALS = true;
doTest();
}
public void testImplicitlyTypedDeclaration() { doTest(); }
private void doTest() {
String name = getTestName(false);