Author: Marek Kurdej Date: 2021-04-27T09:32:09+02:00 New Revision: 3feb84a36f5128dd0f6e9c65314609a9ce4372bc
URL: https://github.com/llvm/llvm-project/commit/3feb84a36f5128dd0f6e9c65314609a9ce4372bc DIFF: https://github.com/llvm/llvm-project/commit/3feb84a36f5128dd0f6e9c65314609a9ce4372bc.diff LOG: [clang-format] Merge SpacesInAngles tests. NFC. Added: Modified: clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 734ffed088a1..8b626f43e0e8 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -10314,20 +10314,6 @@ TEST_F(FormatTest, LayoutCxx11BraceInitializers) { verifyFormat("vector< int > x{ };", SpaceBetweenBraces); } -TEST_F(FormatTest, FormatSpacesInAngles) { - FormatStyle SpaceInAngles = getLLVMStyle(); - SpaceInAngles.SpacesInAngles = true; - verifyFormat("vector< ::std::string > x1;", SpaceInAngles); - verifyFormat("Foo< int, Bar > x2;", SpaceInAngles); - verifyFormat("Foo< ::int, ::Bar > x3;", SpaceInAngles); - - SpaceInAngles.SpacesInAngles = false; - verifyFormat("vector<::std::string> x4;", SpaceInAngles); - verifyFormat("vector<int> x5;", SpaceInAngles); - verifyFormat("Foo<int, Bar> x6;", SpaceInAngles); - verifyFormat("Foo<::int, ::Bar> x7;", SpaceInAngles); -} - TEST_F(FormatTest, FormatsBracedListsInColumnLayout) { verifyFormat("vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777,\n" " 1, 22, 333, 4444, 55555, 666666, 7777777,\n" @@ -18458,6 +18444,10 @@ TEST_F(FormatTest, SpacesInAngles) { FormatStyle Spaces = getLLVMStyle(); Spaces.SpacesInAngles = true; + verifyFormat("vector< ::std::string > x1;", Spaces); + verifyFormat("Foo< int, Bar > x2;", Spaces); + verifyFormat("Foo< ::int, ::Bar > x3;", Spaces); + verifyFormat("static_cast< int >(arg);", Spaces); verifyFormat("template < typename T0, typename T1 > void f() {}", Spaces); verifyFormat("f< int, float >();", Spaces); @@ -18479,6 +18469,11 @@ TEST_F(FormatTest, SpacesInAngles) { verifyFormat("A< A< int > >();", Spaces); Spaces.SpacesInAngles = false; + verifyFormat("vector<::std::string> x4;", Spaces); + verifyFormat("vector<int> x5;", Spaces); + verifyFormat("Foo<int, Bar> x6;", Spaces); + verifyFormat("Foo<::int, ::Bar> x7;", Spaces); + verifyFormat("A<A<int>>();", Spaces); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
