diff options
| author | Owen Pan <owenpiano@gmail.com> | 2023-10-03 18:19:23 -0700 |
|---|---|---|
| committer | Owen Pan <owenpiano@gmail.com> | 2023-10-03 18:19:23 -0700 |
| commit | d08fcc817eba7f0186620688eee73f6d25fa90e8 (patch) | |
| tree | 3f18022c08604f9a9bdcada587d4c62ec7407147 /clang/lib/Format/WhitespaceManager.cpp | |
| parent | 5fc28e7a8d989fffafec2301529d0164a28799b2 (diff) | |
| download | llvm-d08fcc817eba7f0186620688eee73f6d25fa90e8.zip llvm-d08fcc817eba7f0186620688eee73f6d25fa90e8.tar.gz llvm-d08fcc817eba7f0186620688eee73f6d25fa90e8.tar.bz2 | |
Revert "[clang-format] Annotate ctors/dtors as CtorDtorDeclName instead (#67955)"
This reverts commit 6a621ed8e4cb02bd55fe4a4a0254615576b70a55 as it caused
buildbots to fail.
Diffstat (limited to 'clang/lib/Format/WhitespaceManager.cpp')
| -rw-r--r-- | clang/lib/Format/WhitespaceManager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Format/WhitespaceManager.cpp b/clang/lib/Format/WhitespaceManager.cpp index 9061e07..2cbde3d 100644 --- a/clang/lib/Format/WhitespaceManager.cpp +++ b/clang/lib/Format/WhitespaceManager.cpp @@ -975,7 +975,11 @@ void WhitespaceManager::alignConsecutiveDeclarations() { AlignTokens( Style, [](Change const &C) { - if (C.Tok->isOneOf(TT_FunctionDeclarationName, TT_FunctionTypeLParen)) + if (C.Tok->is(TT_FunctionDeclarationName) && C.Tok->Previous && + C.Tok->Previous->isNot(tok::tilde)) { + return true; + } + if (C.Tok->is(TT_FunctionTypeLParen)) return true; if (C.Tok->isNot(TT_StartOfName)) return false; |