From d8d331bc97103b6e191b96189166fefc6be54148 Mon Sep 17 00:00:00 2001 From: Danil Sidoruk Date: Mon, 15 Aug 2022 20:26:56 -0700 Subject: [clang-format] Fix aligning of java-style declarations - Modify TokenAnnotator to work fine with java-style array declarations. - Add test for aligning of java declarations. Fixes #55931. Differential Revision: https://reviews.llvm.org/D129628 --- clang/unittests/Format/FormatTestJava.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'clang/unittests/Format/FormatTestJava.cpp') diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 03e16ae..7b25a0b 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -584,6 +584,17 @@ TEST_F(FormatTestJava, AlignsBlockComments) { " void f() {}")); } +TEST_F(FormatTestJava, AlignDeclarations) { + FormatStyle Style = getLLVMStyle(FormatStyle::LK_Java); + Style.AlignConsecutiveDeclarations.Enabled = true; + verifyFormat("private final String[] args;\n" + "private final A_ParserHelper parserHelper;\n" + "private final int numOfCmdArgs;\n" + "private int numOfCmdArgs;\n" + "private String[] args;", + Style); +} + TEST_F(FormatTestJava, KeepsDelimitersOnOwnLineInJavaDocComments) { EXPECT_EQ("/**\n" " * javadoc line 1\n" -- cgit v1.1