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

cidr-formatter: braces

Browse Source
This commit is contained in:
Anton Makeev
2010-09-10 16:49:48 +04:00
parent 4f08c0cb97
commit fedc22bdba
4 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java
+5 -5
View File
@@ -32,10 +32,10 @@ import org.jetbrains.annotations.NotNull;
public class BraceEnforcer extends JavaJspRecursiveElementVisitor {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.BraceEnforcer");
private final AbstractPostFormatProcessor myPostProcessor;
private final PostFormatProcessorHelper myPostProcessor;
public BraceEnforcer(CodeStyleSettings settings) {
myPostProcessor = new AbstractPostFormatProcessor(settings);
myPostProcessor = new PostFormatProcessorHelper(settings);
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
@@ -96,7 +96,7 @@ public class BraceEnforcer extends JavaJspRecursiveElementVisitor {
private void processStatement(PsiStatement statement, PsiStatement blockCandidate, int options) {
if (blockCandidate instanceof PsiBlockStatement || blockCandidate == null) return;
if (options == CodeStyleSettings.FORCE_BRACES_ALWAYS ||
options == CodeStyleSettings.FORCE_BRACES_IF_MULTILINE && AbstractPostFormatProcessor.isMultiline(statement)) {
options == CodeStyleSettings.FORCE_BRACES_IF_MULTILINE && PostFormatProcessorHelper.isMultiline(statement)) {
replaceWithBlock(statement, blockCandidate);
}
}
@@ -146,11 +146,11 @@ public class BraceEnforcer extends JavaJspRecursiveElementVisitor {
}
protected boolean checkElementContainsRange(final PsiElement element) {
return myPostProcessor.checkElementContainsRange(element);
return myPostProcessor.isElementPartlyInRange(element);
}
protected boolean checkRangeContainsElement(final PsiElement element) {
return myPostProcessor.checkRangeContainsElement(element);
return myPostProcessor.isElementFullyInRange(element);
}
public PsiElement process(PsiElement formatted) {
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java
+5 -5
View File
@@ -40,10 +40,10 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor {
private static final @NonNls String PAGE_DIRECTIVE = "page";
private static final @NonNls String IMPORT_ATT = "import";
private final AbstractPostFormatProcessor myPostProcessor;
private final PostFormatProcessorHelper myPostProcessor;
public ImportsFormatter(final CodeStyleSettings settings, PsiFile file) {
myPostProcessor = new AbstractPostFormatProcessor(settings);
myPostProcessor = new PostFormatProcessorHelper(settings);
myDocumentModel = FormattingDocumentModelImpl.createOn(file);
myIndentOptions = settings.getIndentOptions(file.getFileType());
}
@@ -65,7 +65,7 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor {
@Override public void visitXmlAttribute(XmlAttribute attribute) {
if (isPageDirectiveTag(attribute.getParent())) {
final XmlAttributeValue valueElement = attribute.getValueElement();
if (valueElement != null && checkRangeContainsElement(attribute) && isImportAttribute(attribute) && AbstractPostFormatProcessor
if (valueElement != null && checkRangeContainsElement(attribute) && isImportAttribute(attribute) && PostFormatProcessorHelper
.isMultiline(valueElement)) {
final int oldLength = attribute.getTextLength();
ASTNode valueToken = findValueToken(valueElement.getNode());
@@ -147,11 +147,11 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor {
}
protected boolean checkElementContainsRange(final PsiElement element) {
return myPostProcessor.checkElementContainsRange(element);
return myPostProcessor.isElementPartlyInRange(element);
}
protected boolean checkRangeContainsElement(final PsiElement element) {
return myPostProcessor.checkRangeContainsElement(element);
return myPostProcessor.isElementFullyInRange(element);
}
public PsiElement process(PsiElement formatted) {