From 4c6e00595b444b958bf11a68cceed9d43dbacbc4 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 27 Aug 2013 14:24:43 +0000 Subject: clang-format: Format segments of builder-type calls one per line. This fixes llvm.org/PR14818. Before: return llvm::StringSwitch(name) .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR) .StartsWith(".eh_frame", ORDER_EH_FRAME) .StartsWith(".init", ORDER_INIT).StartsWith(".fini", ORDER_FINI) .StartsWith(".hash", ORDER_HASH).Default(ORDER_TEXT); After: return llvm::StringSwitch(name) .StartsWith(".eh_frame_hdr", ORDER_EH_FRAMEHDR) .StartsWith(".eh_frame", ORDER_EH_FRAME) .StartsWith(".init", ORDER_INIT) .StartsWith(".fini", ORDER_FINI) .StartsWith(".hash", ORDER_HASH) .Default(ORDER_TEXT); llvm-svn: 189353 --- clang/lib/Format/TokenAnnotator.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'clang/lib/Format/TokenAnnotator.cpp') diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index c8dfb13d78a..7f298555079 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1100,10 +1100,8 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, Left.Type == TT_InheritanceColon) return 2; - if (Right.isOneOf(tok::arrow, tok::period) && - Right.Type != TT_DesignatedInitializerPeriod) { - if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen && - Left.MatchingParen->ParameterCount > 0) + if (Right.isMemberAccess()) { + if (Left.isOneOf(tok::r_paren, tok::r_square)) return 20; // Should be smaller than breaking at a nested comma. return 150; } -- cgit v1.2.3