diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index b4969aa2b6fbe..ab56cc8b6f913 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -1078,7 +1078,7 @@ struct FormatStyle { /// This option is renamed to ``BreakTemplateDeclarations``. /// \version 3.4 /// @deprecated - BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations; + // BreakTemplateDeclarationsStyle AlwaysBreakTemplateDeclarations; /// A vector of strings that should be interpreted as attributes/qualifiers /// instead of identifiers. This can be useful for language extensions or @@ -2296,7 +2296,7 @@ struct FormatStyle { /// The template declaration breaking style to use. /// \version 19 - // BreakTemplateDeclarationsStyle BreakTemplateDeclarations; + BreakTemplateDeclarationsStyle BreakTemplateDeclarations; /// If ``true``, consecutive namespace declarations will be on the same /// line. If ``false``, each namespace is declared on a new line. @@ -4822,8 +4822,7 @@ struct FormatStyle { AlwaysBreakAfterReturnType == R.AlwaysBreakAfterReturnType && AlwaysBreakBeforeMultilineStrings == R.AlwaysBreakBeforeMultilineStrings && - AlwaysBreakTemplateDeclarations == - R.AlwaysBreakTemplateDeclarations && + BreakTemplateDeclarations == R.BreakTemplateDeclarations && AttributeMacros == R.AttributeMacros && BinPackArguments == R.BinPackArguments && BinPackParameters == R.BinPackParameters && diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 7fd04b23abdca..0b2ef97af44d8 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -569,9 +569,8 @@ bool ContinuationIndenter::mustBreak(const LineState &State) { return true; } } - return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_No && - (Style.AlwaysBreakTemplateDeclarations != - FormatStyle::BTDS_Leave || + return Style.BreakTemplateDeclarations != FormatStyle::BTDS_No && + (Style.BreakTemplateDeclarations != FormatStyle::BTDS_Leave || Current.NewlinesBefore > 0); } if (Previous.is(TT_FunctionAnnotationRParen) && diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index c5a89490e9287..d2cc466744acb 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -878,7 +878,7 @@ template <> struct MappingTraits { IO.mapOptional("AlignEscapedNewlinesLeft", Style.AlignEscapedNewlines); IO.mapOptional("AllowAllConstructorInitializersOnNextLine", OnNextLine); IO.mapOptional("AlwaysBreakTemplateDeclarations", - Style.AlwaysBreakTemplateDeclarations); + Style.BreakTemplateDeclarations); IO.mapOptional("BreakBeforeInheritanceComma", BreakBeforeInheritanceComma); IO.mapOptional("BreakConstructorInitializersBeforeComma", @@ -972,7 +972,7 @@ template <> struct MappingTraits { IO.mapOptional("BreakInheritanceList", Style.BreakInheritanceList); IO.mapOptional("BreakStringLiterals", Style.BreakStringLiterals); IO.mapOptional("BreakTemplateDeclarations", - Style.AlwaysBreakTemplateDeclarations); + Style.BreakTemplateDeclarations); IO.mapOptional("ColumnLimit", Style.ColumnLimit); IO.mapOptional("CommentPragmas", Style.CommentPragmas); IO.mapOptional("CompactNamespaces", Style.CompactNamespaces); @@ -1441,7 +1441,7 @@ FormatStyle getLLVMStyle(FormatStyle::LanguageKind Language) { LLVMStyle.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; LLVMStyle.AlwaysBreakAfterDefinitionReturnType = FormatStyle::DRTBS_None; LLVMStyle.AlwaysBreakBeforeMultilineStrings = false; - LLVMStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_MultiLine; + LLVMStyle.BreakTemplateDeclarations = FormatStyle::BTDS_MultiLine; LLVMStyle.AttributeMacros.push_back("__capability"); LLVMStyle.BitFieldColonSpacing = FormatStyle::BFCS_Both; LLVMStyle.BinPackArguments = true; @@ -1631,7 +1631,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { FormatStyle::SIS_WithoutElse; GoogleStyle.AllowShortLoopsOnASingleLine = true; GoogleStyle.AlwaysBreakBeforeMultilineStrings = true; - GoogleStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; + GoogleStyle.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; GoogleStyle.DerivePointerAlignment = true; GoogleStyle.IncludeStyle.IncludeCategories = {{"^", 2, 0, false}, {"^<.*\\.h>", 1, 0, false}, @@ -1824,7 +1824,7 @@ FormatStyle getMozillaStyle() { MozillaStyle.AlwaysBreakAfterReturnType = FormatStyle::RTBS_TopLevel; MozillaStyle.AlwaysBreakAfterDefinitionReturnType = FormatStyle::DRTBS_TopLevel; - MozillaStyle.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; + MozillaStyle.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; MozillaStyle.BinPackParameters = false; MozillaStyle.BinPackArguments = false; MozillaStyle.BreakBeforeBraces = FormatStyle::BS_Mozilla; diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index cec56fad53156..b1034002f351b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -5184,8 +5184,8 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, // concept ... if (Right.is(tok::kw_concept)) return Style.BreakBeforeConceptDeclarations == FormatStyle::BBCDS_Always; - return Style.AlwaysBreakTemplateDeclarations == FormatStyle::BTDS_Yes || - (Style.AlwaysBreakTemplateDeclarations == FormatStyle::BTDS_Leave && + return Style.BreakTemplateDeclarations == FormatStyle::BTDS_Yes || + (Style.BreakTemplateDeclarations == FormatStyle::BTDS_Leave && Right.NewlinesBefore > 0); } if (Left.ClosesRequiresClause && Right.isNot(tok::semi)) { @@ -5620,7 +5620,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, if (Right.is(TT_RequiresClause)) return true; if (Left.ClosesTemplateDeclaration) { - return Style.AlwaysBreakTemplateDeclarations != FormatStyle::BTDS_Leave || + return Style.BreakTemplateDeclarations != FormatStyle::BTDS_Leave || Right.NewlinesBefore > 0; } if (Left.is(TT_FunctionAnnotationRParen)) diff --git a/clang/unittests/Format/ConfigParseTest.cpp b/clang/unittests/Format/ConfigParseTest.cpp index 22681a2ac8a3e..571e1ebda14b7 100644 --- a/clang/unittests/Format/ConfigParseTest.cpp +++ b/clang/unittests/Format/ConfigParseTest.cpp @@ -694,32 +694,32 @@ TEST(ConfigParseTest, ParsesConfiguration) { AlwaysBreakAfterReturnType, FormatStyle::RTBS_TopLevelDefinitions); - Style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; - CHECK_PARSE("BreakTemplateDeclarations: Leave", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Leave); - CHECK_PARSE("BreakTemplateDeclarations: No", AlwaysBreakTemplateDeclarations, + Style.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; + CHECK_PARSE("BreakTemplateDeclarations: Leave", BreakTemplateDeclarations, + FormatStyle::BTDS_Leave); + CHECK_PARSE("BreakTemplateDeclarations: No", BreakTemplateDeclarations, FormatStyle::BTDS_No); - CHECK_PARSE("BreakTemplateDeclarations: MultiLine", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); - CHECK_PARSE("BreakTemplateDeclarations: Yes", AlwaysBreakTemplateDeclarations, + CHECK_PARSE("BreakTemplateDeclarations: MultiLine", BreakTemplateDeclarations, + FormatStyle::BTDS_MultiLine); + CHECK_PARSE("BreakTemplateDeclarations: Yes", BreakTemplateDeclarations, + FormatStyle::BTDS_Yes); + CHECK_PARSE("BreakTemplateDeclarations: false", BreakTemplateDeclarations, + FormatStyle::BTDS_MultiLine); + CHECK_PARSE("BreakTemplateDeclarations: true", BreakTemplateDeclarations, FormatStyle::BTDS_Yes); - CHECK_PARSE("BreakTemplateDeclarations: false", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); - CHECK_PARSE("BreakTemplateDeclarations: true", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Yes); // For backward compatibility: CHECK_PARSE("AlwaysBreakTemplateDeclarations: Leave", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Leave); - CHECK_PARSE("AlwaysBreakTemplateDeclarations: No", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_No); + BreakTemplateDeclarations, FormatStyle::BTDS_Leave); + CHECK_PARSE("AlwaysBreakTemplateDeclarations: No", BreakTemplateDeclarations, + FormatStyle::BTDS_No); CHECK_PARSE("AlwaysBreakTemplateDeclarations: MultiLine", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); - CHECK_PARSE("AlwaysBreakTemplateDeclarations: Yes", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Yes); + BreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); + CHECK_PARSE("AlwaysBreakTemplateDeclarations: Yes", BreakTemplateDeclarations, + FormatStyle::BTDS_Yes); CHECK_PARSE("AlwaysBreakTemplateDeclarations: false", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); + BreakTemplateDeclarations, FormatStyle::BTDS_MultiLine); CHECK_PARSE("AlwaysBreakTemplateDeclarations: true", - AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Yes); + BreakTemplateDeclarations, FormatStyle::BTDS_Yes); Style.AlwaysBreakAfterDefinitionReturnType = FormatStyle::DRTBS_All; CHECK_PARSE("AlwaysBreakAfterDefinitionReturnType: None", diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index b1a2247bb85d6..7b65c8d6e21b0 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -10638,7 +10638,7 @@ TEST_F(FormatTest, WrapsTemplateDeclarations) { " const typename aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaa);"); FormatStyle AlwaysBreak = getLLVMStyle(); - AlwaysBreak.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; + AlwaysBreak.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; verifyFormat("template \nclass C {};", AlwaysBreak); verifyFormat("template \nvoid f();", AlwaysBreak); verifyFormat("template \nvoid f() {}", AlwaysBreak); @@ -10667,7 +10667,7 @@ TEST_F(FormatTest, WrapsTemplateDeclarations) { "};"); FormatStyle NeverBreak = getLLVMStyle(); - NeverBreak.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_No; + NeverBreak.BreakTemplateDeclarations = FormatStyle::BTDS_No; verifyFormat("template class C {};", NeverBreak); verifyFormat("template void f();", NeverBreak); verifyFormat("template void f() {}", NeverBreak); @@ -10699,7 +10699,7 @@ TEST_F(FormatTest, WrapsTemplateDeclarations) { NeverBreak); auto Style = getLLVMStyle(); - Style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Leave; + Style.BreakTemplateDeclarations = FormatStyle::BTDS_Leave; verifyNoChange("template \n" "class C {};", @@ -11297,7 +11297,7 @@ TEST_F(FormatTest, UnderstandsFunctionRefQualification) { verifyFormat("SomeType MemberFunction( const Deleted & ) &;", Spaces); FormatStyle BreakTemplate = getLLVMStyle(); - BreakTemplate.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes; + BreakTemplate.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; verifyFormat("struct f {\n" " template \n" @@ -11330,8 +11330,7 @@ TEST_F(FormatTest, UnderstandsFunctionRefQualification) { BreakTemplate); FormatStyle AlignLeftBreakTemplate = getLLVMStyle(); - AlignLeftBreakTemplate.AlwaysBreakTemplateDeclarations = - FormatStyle::BTDS_Yes; + AlignLeftBreakTemplate.BreakTemplateDeclarations = FormatStyle::BTDS_Yes; AlignLeftBreakTemplate.PointerAlignment = FormatStyle::PAS_Left; verifyFormat("struct f {\n"