diff options
| author | Daniel Jasper <djasper@google.com> | 2013-01-14 16:24:39 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-01-14 16:24:39 +0000 |
| commit | 6f5bb2c93c31a7977382c5079d85db8ca3267cd0 (patch) | |
| tree | daac9f82905181c4b2baa1fba3cd7a172776771a /unittests/Format/FormatTest.cpp | |
| parent | fd0ca976bd55167364ba1178e884d275cc6ef30b (diff) | |
Make single-line if statements optional.
Now, "if (a) return;" is only allowed, if this option is set.
Also add a Chromium style which is currently identical to Google style
except for this option.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172431 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Format/FormatTest.cpp')
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 8e55ddb5d0..1ab4a53c40 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -78,6 +78,12 @@ protected: return Style; } + FormatStyle getGoogleStyleWithColumns(unsigned ColumnLimit) { + FormatStyle Style = getGoogleStyle(); + Style.ColumnLimit = ColumnLimit; + return Style; + } + void verifyFormat(llvm::StringRef Code, const FormatStyle &Style = getLLVMStyle()) { EXPECT_EQ(Code.str(), format(messUp(Code), Style)); @@ -130,16 +136,16 @@ TEST_F(FormatTest, FormatsNestedCall) { //===----------------------------------------------------------------------===// TEST_F(FormatTest, FormatIfWithoutCompountStatement) { - verifyFormat("if (true) f();\ng();"); - verifyFormat("if (a)\n if (b)\n if (c) g();\nh();"); + verifyFormat("if (true)\n f();\ng();"); + verifyFormat("if (a)\n if (b)\n if (c)\n g();\nh();"); verifyFormat("if (a)\n if (b) {\n f();\n }\ng();"); - verifyFormat("if (a)\n" - " // comment\n" - " f();"); - verifyFormat("if (a) return;", getLLVMStyleWithColumns(14)); - verifyFormat("if (a)\n return;", getLLVMStyleWithColumns(13)); + verifyGoogleFormat("if (a)\n" + " // comment\n" + " f();"); + verifyFormat("if (a) return;", getGoogleStyleWithColumns(14)); + verifyFormat("if (a)\n return;", getGoogleStyleWithColumns(13)); verifyFormat("if (aaaaaaaaa)\n" - " return;", getLLVMStyleWithColumns(14)); + " return;", getGoogleStyleWithColumns(14)); } TEST_F(FormatTest, ParseIfElse) { @@ -156,7 +162,8 @@ TEST_F(FormatTest, ParseIfElse) { verifyFormat("if (true)\n" " if (true)\n" " if (true) {\n" - " if (true) f();\n" + " if (true)\n" + " f();\n" " } else {\n" " g();\n" " }\n" @@ -1461,7 +1468,8 @@ TEST_F(FormatTest, FormatObjCImplementation) { verifyFormat("@implementation Foo\n" "+ (id)init {\n" - " if (true) return nil;\n" + " if (true)\n" + " return nil;\n" "}\n" "// Look, a comment!\n" "- (int)answerWith:(int)i {\n" |