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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2010-08-03 19:05:17 +04:00
parent 79dc0652a0
commit 72315d0bfa
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeEditUtil.java
+19 -9
View File
@@ -40,9 +40,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public class CodeEditUtil {
private static final Key<Boolean> GENERATED_FLAG = new Key<Boolean>("CREATED BY IDEA");
private static final Key<Integer> INDENT_INFO = new Key<Integer>("INDENTATION");
private static final Key<Boolean> REFORMAT_KEY = new Key<Boolean>("REFORMAT BEFORE THIS ELEMENT");
private static final Key<Boolean> GENERATED_FLAG = new Key<Boolean>("GENERATED_FLAG");
private static final Key<Integer> INDENT_INFO = new Key<Integer>("INDENT_INFO");
private static final Key<Boolean> REFORMAT_KEY = new Key<Boolean>("REFORMAT_KEY");
public static final Key<Boolean> OUTER_OK = new Key<Boolean>("OUTER_OK");
@@ -247,9 +247,15 @@ public class CodeEditUtil {
final int leftBlankLines = getBlankLines(left.getText());
final int rightBlankLines = getBlankLines(right.getText());
final boolean leaveRightText = leftBlankLines < rightBlankLines;
if (leftBlankLines == 0 && rightBlankLines == 0) text = left.getText() + right.getText();
else if (leaveRightText) text = right.getText();
else text = left.getText();
if (leftBlankLines == 0 && rightBlankLines == 0) {
text = left.getText() + right.getText();
}
else if (leaveRightText) {
text = right.getText();
}
else {
text = left.getText();
}
if(leaveRightText || forceReformat){
final LeafElement merged = ASTFactory.whitespace(text);
if(!leaveRightText){
@@ -373,9 +379,13 @@ public class CodeEditUtil {
}
public static void setNodeGenerated(final ASTNode next, final boolean value) {
if(next == null) return;
if(value) next.putCopyableUserData(GENERATED_FLAG, true);
else next.putCopyableUserData(GENERATED_FLAG, null);
if (next == null) return;
if (value) {
next.putCopyableUserData(GENERATED_FLAG, true);
}
else {
next.putCopyableUserData(GENERATED_FLAG, null);
}
}
public static void setOldIndentation(final TreeElement treeElement, final int oldIndentation) {