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

preserve comments when transforming call chain to call sequence

Browse Source
This commit is contained in:
Anna.Kozlova
2017-11-22 19:42:58 +01:00
parent 72bf986c2c
commit 694f804b3e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java
+5 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ipp.base.Intention;
import com.siyeh.ipp.base.PsiElementPredicate;
import com.siyeh.ipp.psiutils.HighlightUtil;
@@ -157,8 +158,9 @@ public class MakeCallChainIntoCallSequenceIntention extends Intention {
final PsiElement appendStatementParent = appendStatement.getParent();
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(manager.getProject());
final PsiCodeBlock codeBlock = factory.createCodeBlockFromText(builder.toString(), appendStatement);
CommentTracker tracker = new CommentTracker();
if (appendStatementParent instanceof PsiLoopStatement || appendStatementParent instanceof PsiIfStatement) {
final PsiElement insertedCodeBlock = appendStatement.replace(codeBlock);
final PsiElement insertedCodeBlock = tracker.replaceAndRestoreComments(appendStatement, codeBlock);
final PsiCodeBlock reformattedCodeBlock = (PsiCodeBlock)codeStyleManager.reformat(insertedCodeBlock);
if (showRenameTemplate) {
final PsiStatement[] statements = reformattedCodeBlock.getStatements();
@@ -170,13 +172,13 @@ public class MakeCallChainIntoCallSequenceIntention extends Intention {
final PsiStatement[] statements = codeBlock.getStatements();
PsiVariable variable = null;
for (int i = 0, length = statements.length; i < length; i++) {
final PsiElement insertedStatement = appendStatementParent.addBefore(statements[i], appendStatement);
final PsiElement insertedStatement = appendStatementParent.addBefore(tracker.markUnchanged(statements[i]), appendStatement);
if (i == 0 && showRenameTemplate) {
variable = (PsiVariable)((PsiDeclarationStatement) insertedStatement).getDeclaredElements()[0];
}
codeStyleManager.reformat(insertedStatement);
}
appendStatement.delete();
tracker.deleteAndRestoreComments(appendStatement);
if (variable != null) {
HighlightUtil.showRenameTemplate(appendStatementParent, variable);
}
plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/call_chain/Builder.java
+1 -1
View File
@@ -1,6 +1,6 @@
class Test {
{
StringBuilder text = null;
text.delete(text.length() - 1, text.length()).ap<caret>pend(";\n");
text.delete(text.length() - 1, text.length()).ap<caret>pend(";\n"); //keep me
}
}
plugins/IntentionPowerPak/test/com/siyeh/ipp/concatenation/call_chain/Builder_after.java
+1 -1
View File
@@ -2,6 +2,6 @@ class Test {
{
StringBuilder text = null;
text.delete(text.length() - 1, text.length());
text.append(";\n");
text.append(";\n");//keep me
}
}