mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Formatter bug fixes.

Browse source
This commit is contained in:
Sergey Prigogin 2011-03-31 06:33:36 +00:00
parent 3452064a2f
commit ae5c304eec
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3384,15 +3384,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor,
}
int nextToken= peekNextToken();
if (node.getPropertyInParent() != ICPPASTQualifiedName.SEGMENT_NAME || nextToken == Token.tGT) {
if (node.getParent().getPropertyInParent() == IASTFunctionCallExpression.FUNCTION_NAME &&
preferences.insert_space_before_opening_paren_in_method_invocation) {
scribe.space();
} else if (node.getParent().getPropertyInParent() != IASTFunctionCallExpression.FUNCTION_NAME &&
preferences.insert_space_after_closing_angle_bracket_in_template_arguments) {
// Avoid explicit space if followed by '*' or '&'.
if (nextToken != Token.tSTAR && nextToken != Token.tAMPER) {
if (nextToken == Token.tLPAREN) {
if (preferences.insert_space_before_opening_paren_in_method_invocation)
scribe.space();
} else if (preferences.insert_space_after_closing_angle_bracket_in_template_arguments) {
// Avoid explicit space if followed by '*' or '&'.
if (nextToken != Token.tSTAR && nextToken != Token.tAMPER)
scribe.space();
}
} else {
scribe.printComment();
scribe.needSpace= false;

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

@ -1244,6 +1244,24 @@ public class CodeFormatterTest extends BaseUITestCase {
assertFormatterResult();
}
//template<typename T>
//class A {
//};
//
//A<int> a = new A <int> ();
//A<int> b = A <int> ();
//template<typename T>
//class A {
//};
//
//A<int> a = new A<int>();
//A<int> b = A<int>();
public void testTemplateConstructorCall() throws Exception {
fOptions.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, CCorePlugin.SPACE);
assertFormatterResult();
}
//#define MY_MACRO int a; \
// int b; \
// int c();