From bf32904276feec46fdeb4058839a11907507c595 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 28 Jan 2011 18:56:49 +0000 Subject: [PATCH] More readable names for list alignments. --- .../cdt/internal/formatter/CodeFormatterVisitor.java | 7 ++++--- 1 file changed, 4 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 2b2a7b383c7..0a5a54574f8 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 @@ -1664,12 +1664,13 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, * @param encloseInParen * @param addEllipsis */ - private void formatList(List elements, ListAlignment align, boolean encloseInParen, boolean addEllipsis) { + private void formatList(List elements, ListAlignment align, + boolean encloseInParen, boolean addEllipsis) { if (encloseInParen) scribe.printNextToken(Token.tLPAREN, align.fSpaceBeforeOpeningParen); final int elementsLength = elements.size(); - if (elementsLength != 0 || addEllipsis) { + if (!elements.isEmpty() || addEllipsis) { if (align.fSpaceAfterOpeningParen) { scribe.space(); } @@ -1678,7 +1679,7 @@ public class CodeFormatterVisitor extends ASTVisitor implements ICPPASTVisitor, ? align.fContinuationIndentation : preferences.continuation_indentation; Alignment listAlignment = scribe.createAlignment( - "listElements_"+align, //$NON-NLS-1$ + "listElements_" + (elements.isEmpty() ? "ellipsis" : elements.get(0).getClass().getSimpleName()), //$NON-NLS-1$ //$NON-NLS-2$ align.fMode, align.fTieBreakRule, elementsLength + (addEllipsis ? 1 : 0),