From 2c3979ce37182708d0da8348692b89cff14a9acd Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Mon, 23 Mar 2009 09:53:46 +0000 Subject: [PATCH] Bug 269590 - Format error for global const typename --- .../cdt/internal/formatter/CodeFormatterVisitor.java | 6 +++--- .../eclipse/cdt/ui/tests/text/CodeFormatterTest.java | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java index 3ebfbcb083b..a3690dacfa1 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/CodeFormatterVisitor.java @@ -1352,15 +1352,15 @@ public class CodeFormatterVisitor extends CPPASTVisitor { } private int visit(IASTNamedTypeSpecifier node) { + if (scribe.printModifiers()) { + scribe.space(); + } if (node instanceof ICPPASTNamedTypeSpecifier) { if (((ICPPASTNamedTypeSpecifier)node).isTypename()) { scribe.printNextToken(Token.t_typename); scribe.space(); } } - if (scribe.printModifiers()) { - scribe.space(); - } node.getName().accept(this); return PROCESS_SKIP; } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java index 2578189b9fe..ef7f6570662 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/CodeFormatterTest.java @@ -1157,4 +1157,14 @@ public class CodeFormatterTest extends BaseUITestCase { assertFormatterResult(); } + //inline typename A foo(); + //void bar(const typename A x) ; + //static typename A x ; + + //inline typename A foo(); + //void bar(const typename A x); + //static typename A x; + public void testFormatterProblemsWithTypename_Bug269590() throws Exception { + assertFormatterResult(); + } }