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

ClangFormat: Adapt to changes in LLVM 16

Browse Source 
Change-Id: Ia4a2cf21e351095609d8858f1f9355c6607470f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2023-01-31 08:11:29 +01:00
parent 50ee70fcee
commit e20bdfae4d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangformat/clangformatbaseindenter.cpp
View File

@@ -38,7 +38,11 @@ void adjustFormatStyleForLineBreak(clang::format::FormatStyle &style,
#else #else
style.SortIncludes = false; style.SortIncludes = false;
#endif #endif
#if LLVM_VERSION_MAJOR >= 16
style.SortUsingDeclarations = clang::format::FormatStyle::SUD_Never;
#else
style.SortUsingDeclarations = false; style.SortUsingDeclarations = false;
#endif
// This is a separate pass, don't do it unless it's the full formatting. // This is a separate pass, don't do it unless it's the full formatting.
style.FixNamespaceComments = false; style.FixNamespaceComments = false;

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

@@ -151,7 +151,11 @@ clang::format::FormatStyle qtcStyle()
#else #else
style.SortIncludes = true; style.SortIncludes = true;
#endif #endif
#if LLVM_VERSION_MAJOR >= 16
style.SortUsingDeclarations = FormatStyle::SUD_Lexicographic;
#else
style.SortUsingDeclarations = true; style.SortUsingDeclarations = true;
#endif
style.SpaceAfterCStyleCast = true; style.SpaceAfterCStyleCast = true;
style.SpaceAfterTemplateKeyword = false; style.SpaceAfterTemplateKeyword = false;
style.SpaceBeforeAssignmentOperators = true; style.SpaceBeforeAssignmentOperators = true;