mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 14:12:10 +02:00
Code Issues Wiki Activity

Bug 535274 Follow up cosmetics

Browse source 
Change-Id: I562bc0925e53a461bd9e6362dc14f2e1cd924582
Signed-off-by: Thomas Corbat <tcorbat@hsr.ch>
This commit is contained in:
Thomas Corbat 2018-06-20 15:45:09 +02:00
parent bc4aa4597d
commit 512b73075f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java
View file

@ -18,7 +18,6 @@ import java.util.Collections;
import java.util.EmptyStackException; import java.util.EmptyStackException;
import java.util.List; import java.util.List;
import java.util.Stack; import java.util.Stack;
import java.util.function.Predicate;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.ast.ASTVisitor; import org.eclipse.cdt.core.dom.ast.ASTVisitor;
@ -158,6 +157,8 @@ import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterConstants;
import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions; import org.eclipse.cdt.core.formatter.DefaultCodeFormatterOptions;
import org.eclipse.cdt.core.parser.IToken; import org.eclipse.cdt.core.parser.IToken;
import org.eclipse.cdt.core.parser.util.IUnaryPredicate;
import org.eclipse.cdt.core.parser.util.InstanceOfPredicate;
import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
import org.eclipse.cdt.internal.formatter.align.Alignment; import org.eclipse.cdt.internal.formatter.align.Alignment;
@ -1108,13 +1109,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
// namespace <name> // namespace <name>
scribe.printNextToken(Token.t_namespace, false); scribe.printNextToken(Token.t_namespace, false);
scribe.space(); scribe.space();
formatLeadingAttributes(node, ICPPASTAttributeList.class::isInstance); formatLeadingAttributes(node, ICPPASTAttributeList.TYPE_FILTER);
boolean isNamedNamespace = !CPPVisitor.isAnonymousNamespace(node); boolean isNamedNamespace = !CPPVisitor.isAnonymousNamespace(node);
if (isNamedNamespace) { if (isNamedNamespace) {
IASTName name = node.getName(); IASTName name = node.getName();
name.accept(this); name.accept(this);
} }
formatAttributes(node, isNamedNamespace, false, IGCCASTAttributeList.class::isInstance); formatAttributes(node, isNamedNamespace, false, IGCCASTAttributeList.TYPE_FILTER);
// member declarations // member declarations
IASTDeclaration[] memberDecls= node.getDeclarations(); IASTDeclaration[] memberDecls= node.getDeclarations();
@ -1558,7 +1559,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
* @param owner Node containing attributes * @param owner Node containing attributes
* @param filter Filter predicate for specifying which attributes to print * @param filter Filter predicate for specifying which attributes to print
*/ */
private void formatLeadingAttributes(IASTAttributeOwner owner, Predicate<IASTAttributeSpecifier> predicate) { private void formatLeadingAttributes(IASTAttributeOwner owner, InstanceOfPredicate<IASTAttributeSpecifier> predicate) {
formatAttributes(owner, false, true, predicate); formatAttributes(owner, false, true, predicate);
} }
@ -1575,7 +1576,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
* @param filter Filter predicate for specifying which attributes to print * @param filter Filter predicate for specifying which attributes to print
*/ */
private void formatAttributes(IASTAttributeOwner owner, boolean printLeadingSpace, private void formatAttributes(IASTAttributeOwner owner, boolean printLeadingSpace,
boolean printTrailingSpace, Predicate<IASTAttributeSpecifier> filter) { boolean printTrailingSpace, IUnaryPredicate<IASTAttributeSpecifier> filter) {
if (owner == null) { if (owner == null) {
return; return;
} }
@ -1585,7 +1586,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
scribe.space(); scribe.space();
} }
for (IASTAttributeSpecifier attributeSpecifier : attributeSpecifiers) { for (IASTAttributeSpecifier attributeSpecifier : attributeSpecifiers) {
if (filter.test(attributeSpecifier)) { if (filter.apply(attributeSpecifier)) {
formatRaw(attributeSpecifier); formatRaw(attributeSpecifier);
} }
} }