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

inplace introduce: insert whitespace before template if needed (IDEA-87487)

Browse Source
This commit is contained in:
Anna Kozlova
2012-08-16 16:23:47 +04:00
parent 2d01b2149c
commit 7f7ce8da4d
4 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/refactoring/inplaceIntroduceField/templateAdjustment.java
+5
View File
@@ -0,0 +1,5 @@
class Test {
int f(){
return<caret>-1;
}
}
java/java-tests/testData/refactoring/inplaceIntroduceField/templateAdjustment_after.java
+9
View File
@@ -0,0 +1,9 @@
class Test {
private int anInt;
int f(){
anInt = -1;
return anInt;
}
}
java/java-tests/testSrc/com/intellij/refactoring/InplaceIntroduceFieldTest.java
+9
View File
@@ -43,6 +43,15 @@ public class InplaceIntroduceFieldTest extends AbstractJavaInplaceIntroduceTest
public void testBeforeAssignment() throws Exception {
doTest(new Pass<AbstractInplaceIntroducer>() {
@Override
public void pass(AbstractInplaceIntroducer inplaceIntroduceFieldPopup) {
}
});
}
public void testTemplateAdjustment() throws Exception {
doTest(new Pass<AbstractInplaceIntroducer>() {
@Override
public void pass(AbstractInplaceIntroducer inplaceIntroduceFieldPopup) {
platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java
+19 -1
View File
@@ -21,6 +21,11 @@ import com.intellij.codeInsight.template.ExpressionContext;
import com.intellij.codeInsight.template.TextResult;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.lang.ASTNode;
import com.intellij.lang.LanguageTokenSeparatorGenerators;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.command.impl.StartMarkAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
@@ -68,7 +73,20 @@ public abstract class InplaceVariableIntroducer<E extends PsiElement> extends In
super(editor, elementToRename, project);
myTitle = title;
myOccurrences = occurrences;
myExpr = expr;
if (expr != null) {
final ASTNode node = expr.getNode();
final ASTNode astNode = LanguageTokenSeparatorGenerators.INSTANCE.forLanguage(expr.getLanguage())
.generateWhitespaceBetweenTokens(node.getTreePrev(), node);
if (astNode != null) {
new WriteCommandAction<Object>(project, "Normalize declaration") {
@Override
protected void run(Result<Object> result) throws Throwable {
node.getTreeParent().addChild(astNode, node);
}
}.execute();
}
myExpr = expr;
}
myExprMarker = myExpr != null && myExpr.isPhysical() ? createMarker(myExpr) : null;
initOccurrencesMarkers();
}