diff options
| author | Owen Pan <owenpiano@gmail.com> | 2023-10-24 02:13:14 -0700 |
|---|---|---|
| committer | Owen Pan <owenpiano@gmail.com> | 2023-10-24 02:15:44 -0700 |
| commit | 7bc1031c474ebb2216a5432273dafe4d1490fbce (patch) | |
| tree | 78fe19b1218a963a7e52281d3a0a9a83a32799a0 /clang | |
| parent | 97f1db2fdd5810e15d152167e9f1e29159a8cee9 (diff) | |
| download | llvm-7bc1031c474ebb2216a5432273dafe4d1490fbce.zip llvm-7bc1031c474ebb2216a5432273dafe4d1490fbce.tar.gz llvm-7bc1031c474ebb2216a5432273dafe4d1490fbce.tar.bz2 | |
Revert "[clang-format] Fix align consecutive declarations over function pointers"
This reverts commit a84e0b4bdc9999872adbdaafbade8164b197784b.
Fixes #68079.
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/WhitespaceManager.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp index dc81060..dbe6175 100644 --- a/clang/lib/Format/WhitespaceManager.cpp +++ b/clang/lib/Format/WhitespaceManager.cpp @@ -980,7 +980,7 @@ void WhitespaceManager::alignConsecutiveDeclarations() { AlignTokens( Style, [](Change const &C) { - if (C.Tok->isOneOf(TT_FunctionDeclarationName, TT_FunctionTypeLParen)) + if (C.Tok->is(TT_FunctionDeclarationName)) return true; if (C.Tok->isNot(TT_StartOfName)) return false; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index d571178..02447de 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -2033,8 +2033,6 @@ TEST_F(FormatTest, SeparatePointerReferenceAlignment) { "const unsigned int *d;\n" "Const unsigned int &e;\n" "const unsigned int &f;\n" - "int *f1(int *a, int &b, int &&c);\n" - "double *(*f2)(int *a, double &&b);\n" "const unsigned &&g;\n" "Const unsigned h;", Style); @@ -2080,8 +2078,6 @@ TEST_F(FormatTest, SeparatePointerReferenceAlignment) { "const unsigned int* d;\n" "Const unsigned int& e;\n" "const unsigned int& f;\n" - "int* f1(int* a, int& b, int&& c);\n" - "double* (*f2)(int* a, double&& b);\n" "const unsigned&& g;\n" "Const unsigned h;", Style); @@ -2107,8 +2103,6 @@ TEST_F(FormatTest, SeparatePointerReferenceAlignment) { "const unsigned int *d;\n" "Const unsigned int& e;\n" "const unsigned int& f;\n" - "int *f1(int *a, int& b, int&& c);\n" - "double *(*f2)(int *a, double&& b);\n" "const unsigned g;\n" "Const unsigned h;", Style); @@ -2149,8 +2143,6 @@ TEST_F(FormatTest, SeparatePointerReferenceAlignment) { "const unsigned int* d;\n" "Const unsigned int & e;\n" "const unsigned int & f;\n" - "int* f1(int* a, int & b, int && c);\n" - "double* (*f2)(int* a, double && b);\n" "const unsigned && g;\n" "Const unsigned h;", Style); @@ -2176,8 +2168,6 @@ TEST_F(FormatTest, SeparatePointerReferenceAlignment) { "const unsigned int * d;\n" "Const unsigned int &e;\n" "const unsigned int &f;\n" - "int * f1(int * a, int &b, int &&c);\n" - "double * (*f2)(int * a, double &&b);\n" "const unsigned &&g;\n" "Const unsigned h;", Style); |