mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Formatter support for defaulted and deleted functions and for rvalue

Browse source 
references.
This commit is contained in:
Sergey Prigogin 2012-12-05 11:47:53 -08:00
parent 81c9f2d755
commit 35a973d9a5
2 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1326,12 +1326,11 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
Runnable tailFormatter = null;
IASTStatement bodyStmt= node.getBody();
if (DefaultCodeFormatterConstants.END_OF_LINE.equals(preferences.brace_position_for_method_declaration) &&
!hasMemberInitializers(node) && !(node instanceof ICPPASTFunctionWithTryBlock)) {
if (bodyStmt instanceof IASTCompoundStatement && !startsWithMacroExpansion(bodyStmt)) {
tailFormatter = new TrailingTokenFormatter(Token.tLBRACE, nodeOffset(bodyStmt),
preferences.insert_space_before_opening_brace_in_method_declaration, false);
scribe.setTailFormatter(tailFormatter);
}
!hasMemberInitializers(node) && !(node instanceof ICPPASTFunctionWithTryBlock) &&
bodyStmt instanceof IASTCompoundStatement && !startsWithMacroExpansion(bodyStmt)) {
tailFormatter = new TrailingTokenFormatter(Token.tLBRACE, nodeOffset(bodyStmt),
preferences.insert_space_before_opening_brace_in_method_declaration, false);
scribe.setTailFormatter(tailFormatter);
}
declarator.accept(this);
@ -1342,8 +1341,9 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
}
if (node instanceof ICPPASTFunctionDefinition) {
ICPPASTFunctionDefinition cppFunctionDefinition = (ICPPASTFunctionDefinition) node;
final ICPPASTConstructorChainInitializer[] constructorChain=
((ICPPASTFunctionDefinition) node).getMemberInitializers();
cppFunctionDefinition.getMemberInitializers();
if (constructorChain != null && constructorChain.length > 0) {
if (preferences.insert_new_line_before_colon_in_constructor_initializer_list) {
scribe.printTrailingComment();
@ -1363,6 +1363,25 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
formatList(Arrays.asList(constructorChain), options, false, false, null);
scribe.unIndentForContinuation();
}
if (cppFunctionDefinition.isDefaulted() || cppFunctionDefinition.isDeleted()) {
int token = peekNextToken();
if (token == Token.tASSIGN) {
if (preferences.insert_space_before_assignment_operator)
scribe.space();
scribe.printNextToken(token);
if (preferences.insert_space_after_assignment_operator)
scribe.space();
}
token = peekNextToken();
if (token == Token.t_default || token == Token.t_delete) {
scribe.printNextToken(token);
}
if (bodyStmt == null) {
tailFormatter = new TrailingSemicolonFormatter(node);
scribe.setTailFormatter(tailFormatter);
}
}
}
if (tailFormatter != null) {
@ -1385,7 +1404,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
exitNode(bodyStmt);
}
}
} else {
} else if (bodyStmt != null) {
bodyStmt.accept(this);
}
scribe.printTrailingComment();
@ -1563,7 +1582,11 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
scribe.space();
}
if (pointer instanceof ICPPASTReferenceOperator) {
scribe.printNextToken(Token.tAMPER, false);
if (((ICPPASTReferenceOperator) pointer).isRValueReference()) {
scribe.printNextToken(Token.tAND, false);
} else {
scribe.printNextToken(Token.tAMPER, false);
}
} else if (pointer instanceof ICPPASTPointerToMember) {
final ICPPASTPointerToMember ptrToMember= (ICPPASTPointerToMember) pointer;
final IASTName name= ptrToMember.getName();

22
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java
View file

@ -1140,6 +1140,28 @@ public class CodeFormatterTest extends BaseUITestCase {
assertFormatterResult();
}
//struct moveonly {
//moveonly()=default;
//moveonly(const moveonly&)=delete;
//moveonly(moveonly&&)=default;
//moveonly& operator=(const moveonly&)=delete;
//moveonly& operator=(moveonly&&)=default;
//~moveonly()=default;
//};
//struct moveonly {
// moveonly() = default;
// moveonly(const moveonly&) = delete;
// moveonly(moveonly&&) = default;
// moveonly& operator=(const moveonly&) = delete;
// moveonly& operator=(moveonly&&) = default;
// ~moveonly() = default;
//};
public void testFunctionDefinitionWithoutBody() throws Exception {
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.SPACE);
assertFormatterResult();
}
//int f1(int a, int b, int c, int d, int e, int f, int g);
//int f2(int a, int b, int c, int d, int e, int f, int g);
//