From 2631135c07ddaf135f873baacc6dcc3e3b52ac18 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Fri, 15 Dec 2006 10:38:13 +0000 Subject: [PATCH] Code formatter: Fix skipping of non-local declarations --- .../cdt/internal/formatter/CodeFormatterVisitor.java | 6 +++--- 1 file changed, 3 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 eb673a4e5a8..180561b994f 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 @@ -246,6 +246,9 @@ public class CodeFormatterVisitor extends CPPASTVisitor { IASTDeclaration[] decls= tu.getDeclarations(); for (int i = 0; i < decls.length; i++) { IASTDeclaration declaration = decls[i]; + if (!fTranslationUnitFile.equals(declaration.getContainingFilename())) { + continue; + } try { declaration.accept(this); scribe.printNewLine(); @@ -270,9 +273,6 @@ public class CodeFormatterVisitor extends CPPASTVisitor { * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclaration) */ public int visit(IASTDeclaration node) { - if (!fTranslationUnitFile.equals(node.getContainingFilename())) { - return PROCESS_SKIP; - } int indentLevel= scribe.indentationLevel; try { if (node.getNodeLocations()[0] instanceof IASTMacroExpansion) {