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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Ic24d9800eceafa17c51f2ac9c989f55a9b6e920a
This commit is contained in:
Eike Ziller
2023-08-03 13:18:37 +02:00
parent d59d017388 9ad9e49ccf
commit 960ebb3a85
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,7 +161,9 @@ clang::format::FormatStyle calculateQtcStyle()
style.SpaceAfterTemplateKeyword = false; style.SpaceAfterTemplateKeyword = false;
style.SpaceBeforeAssignmentOperators = true; style.SpaceBeforeAssignmentOperators = true;
style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements; style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
#if LLVM_VERSION_MAJOR < 17
style.SpaceInEmptyParentheses = false; style.SpaceInEmptyParentheses = false;
#endif
style.SpacesBeforeTrailingComments = 1; style.SpacesBeforeTrailingComments = 1;
#if LLVM_VERSION_MAJOR >= 13 #if LLVM_VERSION_MAJOR >= 13
style.SpacesInAngles = FormatStyle::SIAS_Never; style.SpacesInAngles = FormatStyle::SIAS_Never;
@@ -169,8 +171,12 @@ clang::format::FormatStyle calculateQtcStyle()
style.SpacesInAngles = false; style.SpacesInAngles = false;
#endif #endif
style.SpacesInContainerLiterals = false; style.SpacesInContainerLiterals = false;
#if LLVM_VERSION_MAJOR >= 17
style.SpacesInParens = FormatStyle::SIPO_Never;
#else
style.SpacesInCStyleCastParentheses = false; style.SpacesInCStyleCastParentheses = false;
style.SpacesInParentheses = false; style.SpacesInParentheses = false;
#endif
style.SpacesInSquareBrackets = false; style.SpacesInSquareBrackets = false;
addQtcStatementMacros(style); addQtcStatementMacros(style);
style.Standard = FormatStyle::LS_Cpp11; style.Standard = FormatStyle::LS_Cpp11;