MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

split declaration: fix comments in context

Browse Source
This commit is contained in:
Anna Kozlova
2018-06-04 15:24:54 +03:00
parent 446c6110f1
commit 1ef91b8eb4
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.CommentTracker;
import org.jetbrains.annotations.NotNull;
/**
@@ -148,11 +147,10 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction {
.createStatementFromText(var.getName() + "=xxx;", decl);
statement = (PsiExpressionStatement)CodeStyleManager.getInstance(project).reformat(statement);
PsiAssignmentExpression assignment = (PsiAssignmentExpression)statement.getExpression();
CommentTracker commentTracker = new CommentTracker();
PsiExpression initializer = var.getInitializer();
PsiExpression rExpression = RefactoringUtil.convertInitializerToNormalExpression(initializer, var.getType());
commentTracker.replace(assignment.getRExpression(), rExpression);
assignment.getRExpression().replace(rExpression);
PsiElement block = decl.getParent();
if (block instanceof PsiForStatement) {
@@ -188,7 +186,7 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction {
return (PsiAssignmentExpression)((PsiExpressionStatement)block.addAfter(statement, decl)).getExpression();
}
finally {
commentTracker.deleteAndRestoreComments(initializer);
initializer.delete();
}
}
}

6
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/splitDeclaration/afterCommentsInInitializer.java
View File

@@ -2,8 +2,8 @@
import java.util.*;
class Test {
{
List<String> l //end line comment
;
l = new ArrayList<>();
List<String> l;
l = new ArrayList//end line comment
<>();
}
}