From 79dffb412840c1487396be5fa07e8cfb8ac0d07d Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 7 May 2014 09:48:30 +0000 Subject: clang-format: Be slightly more aggressive on single-line functions. So that JS functions can also be merged into a single line. Before: var func = function() { return 1; }; After: var func = function() { return 1; }; llvm-svn: 208176 --- clang/lib/Format/Format.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'clang/lib/Format') diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 21334ad9c80..008b4159fa3 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -654,6 +654,10 @@ private: Tok->CanBreakBefore = true; return 1; } else if (Limit != 0 && Line.First->isNot(tok::kw_namespace)) { + // We don't merge short records. + if (Line.First->isOneOf(tok::kw_class, tok::kw_union, tok::kw_struct)) + return 0; + // Check that we still have three lines and they fit into the limit. if (I + 2 == E || I[2]->Type == LT_Invalid) return 0; @@ -672,9 +676,9 @@ private: Tok = Tok->Next; } while (Tok != NULL); - // Last, check that the third line contains a single closing brace. + // Last, check that the third line starts with a closing brace. Tok = I[2]->First; - if (Tok->getNextNonComment() != NULL || Tok->isNot(tok::r_brace)) + if (Tok->isNot(tok::r_brace)) return 0; return 2; -- cgit v1.2.3