From b48d3afcd53e16712f55836a81f08a1d65953540 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 9 Apr 2014 10:01:49 +0000 Subject: clang-format: Keep more trailing annotations on the same line. More precisely keep all short annotations (<10 characters) on the same line if possible. Previously, clang-format would only prefer to do so for "const", "override" and "final". However, it seems to be generally preferable, especially because some codebases have to wrap those in macros for backwards compatibility. Before: void someLongFunction(int someLongParameter) OVERRIDE {} After: void someLongFunction( int someLongParameter) OVERRIDE {} This fixes llvm.org/PR19363. llvm-svn: 205845 --- clang/unittests/Format/FormatTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'clang/unittests/Format/FormatTest.cpp') diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 5adc0d5725b..e3da016663c 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -3269,9 +3269,15 @@ TEST_F(FormatTest, BreaksFunctionDeclarationsWithTrailingTokens) { verifyFormat("void someLongFunction(\n" " int someLongParameter) override {}", Style); + verifyFormat("void someLongFunction(\n" + " int someLongParameter) OVERRIDE {}", + Style); verifyFormat("void someLongFunction(\n" " int someLongParameter) final {}", Style); + verifyFormat("void someLongFunction(\n" + " int someLongParameter) FINAL {}", + Style); verifyFormat("void someLongFunction(\n" " int parameter) const override {}", Style); -- cgit v1.2.3