diff options
Diffstat (limited to 'clang/unittests/Format/FormatTest.cpp')
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index cf5c2324815..15d05f5575e 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -2840,33 +2840,36 @@ TEST_F(FormatTest, TrailingReturnType) { } TEST_F(FormatTest, BreaksFunctionDeclarationsWithTrailingTokens) { - // Avoid breaking before trailing 'const'. - verifyFormat("void someLongFunction(\n" - " int someLongParameter) const {}", - getLLVMStyleWithColumns(46)); + // Avoid breaking before trailing 'const' or other trailing annotations, if + // they are not function-like. FormatStyle Style = getGoogleStyle(); Style.ColumnLimit = 47; verifyFormat("void\n" "someLongFunction(int someLongParameter) const {\n}", getLLVMStyleWithColumns(47)); - verifyFormat("void someLongFunction(\n" - " int someLongParameter) const {}", - Style); verifyFormat("LoooooongReturnType\n" "someLoooooooongFunction() const {}", getLLVMStyleWithColumns(47)); verifyFormat("LoooooongReturnType someLoooooooongFunction()\n" " const {}", Style); - - // Avoid breaking before other trailing annotations, if they are not - // function-like. - verifyFormat("void SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaa) OVERRIDE;"); - verifyFormat("void SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaa) OVERRIDE FINAL;"); - verifyFormat("void SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaa,\n" - " aaaaaaaaaaaaaaaaaaaaaaaaaa) override final;"); + verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n" + " aaaaa aaaaaaaaaaaaaaaaaaaa) OVERRIDE;"); + verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n" + " aaaaa aaaaaaaaaaaaaaaaaaaa) OVERRIDE FINAL;"); + verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n" + " aaaaa aaaaaaaaaaaaaaaaaaaa) override final;"); + + // Unless this would lead to the first parameter being broken. + verifyFormat("void someLongFunction(int someLongParameter)\n" + " const {}", + getLLVMStyleWithColumns(46)); + verifyFormat("void someLongFunction(int someLongParameter)\n" + " const {}", + Style); + verifyFormat("void SomeFunction(aaaaaaaaaa aaaaaaaaaaaaaaa,\n" + " aaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n" + " LONG_AND_UGLY_ANNOTATION;"); // Breaking before function-like trailing annotations is fine to keep them // close to their arguments. |
