From 734d52b58bf3056a91e16c866da00f5b49e40098 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 14 Nov 2014 10:15:56 +0000 Subject: clang-format: [Java] Fix line break behavior of class declarations. Change breaking preferences: 1. Break before "extends" 2. Break before "implements" 3. Break within the implements list. llvm-svn: 221981 --- clang/unittests/Format/FormatTestJava.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'clang/unittests/Format/FormatTestJava.cpp') diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 3799003..6523c86 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -69,8 +69,11 @@ TEST_F(FormatTestJava, ClassDeclarations) { "}"); verifyFormat("public class A extends B.C {}"); + verifyFormat("abstract class SomeClass\n" + " extends SomeOtherClass implements SomeInterface {}", + getStyleWithColumns(60)); verifyFormat("abstract class SomeClass extends SomeOtherClass\n" - " implements SomeInterface {}", + " implements SomeInterfaceeeeeeeeeeeee {}", getStyleWithColumns(60)); verifyFormat("abstract class SomeClass\n" " extends SomeOtherClass\n" @@ -81,14 +84,17 @@ TEST_F(FormatTestJava, ClassDeclarations) { " implements SomeInterface,\n" " AnotherInterface {}", getStyleWithColumns(40)); + verifyFormat("abstract class SomeClass\n" + " implements SomeInterface, AnotherInterface {}", + getStyleWithColumns(60)); verifyFormat("@SomeAnnotation()\n" - "abstract class aaaaaaaaaaaa extends bbbbbbbbbbbbbbb\n" - " implements cccccccccccc {\n" + "abstract class aaaaaaaaaaaa\n" + " extends bbbbbbbbbbbbbbb implements cccccccccccc {\n" "}", getStyleWithColumns(76)); verifyFormat("@SomeAnnotation()\n" - "abstract class aaaaaaaaa extends bbbbbbbbbbbb\n" - " implements cccccccccccc {\n" + "abstract class aaaaaaaaa\n" + " extends bbbbbbbbbbbb implements cccccccccccc {\n" "}", getStyleWithColumns(76)); verifyFormat("interface SomeInterface extends Foo, Bar {\n" -- cgit v1.1