feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangFormat: Adjust for clang-format 19 and 20

Browse Source 
Fixes: QTCREATORBUG-31758
Change-Id: I4ed1980d55875a364562585c5c31823ff97674dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Artem Sokolovskii
2024-10-07 10:24:24 +02:00
parent 3c2296ae63
commit 711c6d850a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/clangformat/clangformatutils.cpp
View File

@@ -40,7 +40,13 @@ clang::format::FormatStyle calculateQtcStyle()
style.Language = FormatStyle::LK_Cpp; style.Language = FormatStyle::LK_Cpp;
style.AccessModifierOffset = -4; style.AccessModifierOffset = -4;
style.AlignAfterOpenBracket = FormatStyle::BAS_Align; style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
#if LLVM_VERSION_MAJOR >= 15 #if LLVM_VERSION_MAJOR >= 20
style.AlignConsecutiveAssignments = {false, false, false, false, false, false, false};
style.AlignConsecutiveDeclarations = {false, false, false, false, false, false, false};
#elif LLVM_VERSION_MAJOR == 19
style.AlignConsecutiveAssignments = {false, false, false, false, false, false};
style.AlignConsecutiveDeclarations = {false, false, false, false, false, false};
#elif LLVM_VERSION_MAJOR >= 15
style.AlignConsecutiveAssignments = {false, false, false, false, false}; style.AlignConsecutiveAssignments = {false, false, false, false, false};
style.AlignConsecutiveDeclarations = {false, false, false, false, false}; style.AlignConsecutiveDeclarations = {false, false, false, false, false};
#else #else
@@ -117,7 +123,11 @@ clang::format::FormatStyle calculateQtcStyle()
style.IndentWrappedFunctionNames = false; style.IndentWrappedFunctionNames = false;
style.JavaScriptQuotes = FormatStyle::JSQS_Leave; style.JavaScriptQuotes = FormatStyle::JSQS_Leave;
style.JavaScriptWrapImports = true; style.JavaScriptWrapImports = true;
#if LLVM_VERSION_MAJOR >= 19
style.KeepEmptyLines = {false, false, false};
#else
style.KeepEmptyLinesAtTheStartOfBlocks = false; style.KeepEmptyLinesAtTheStartOfBlocks = false;
#endif
// Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between. // Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
style.MacroBlockBegin = ""; style.MacroBlockBegin = "";
style.MacroBlockEnd = ""; style.MacroBlockEnd = "";