From 190fbda6ded9cfdf67b0903e82a0cd0853da3a73 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 14 Jan 2015 10:36:31 +0000 Subject: [PATCH] clang-format: [Java] Prefer not to break in parameter annotations. Before: boolean someFunction(@Param(aaaaaaaaaaaaaaaa) String aaaaa, String bbbbbbbbbbbbbbb) {} After: boolean someFunction( @Param(aaaaaaaaaaaaaaaa) String aaaaa, String bbbbbbbbbbbbbbb) {} llvm-svn: 225971 --- clang/lib/Format/TokenAnnotator.cpp | 2 ++ clang/unittests/Format/FormatTestJava.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 34d8835..d0d888f 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1587,6 +1587,8 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, return Left.ParameterCount > 1 ? Style.PenaltyBreakBeforeFirstCallParameter : 19; } + if (Left.is(TT_JavaAnnotation)) + return 50; if (Right.is(tok::lessless)) { if (Left.is(tok::string_literal)) { diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 9b3b993..af4199b 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -287,6 +287,12 @@ TEST_F(FormatTestJava, Annotations) { "ReturnType doSomething(\n" " String aaaaaaaaaaaaa, String bbbbbbbbbbbbbbb) {}", getStyleWithColumns(60)); + verifyFormat("{\n" + " boolean someFunction(\n" + " @Param(aaaaaaaaaaaaaaaa) String aaaaa,\n" + " String bbbbbbbbbbbbbbb) {}\n" + "}", + getStyleWithColumns(60)); } TEST_F(FormatTestJava, Generics) { -- 2.7.4