Index: clang/lib/Format/BreakableToken.cpp =================================================================== --- clang/lib/Format/BreakableToken.cpp +++ clang/lib/Format/BreakableToken.cpp @@ -864,7 +864,8 @@ // tokens by the empty string. Whitespaces.replaceWhitespace( *Tokens[LineIndex], /*Newlines=*/0, /*Spaces=*/0, - /*StartOfTokenColumn=*/StartColumn, /*InPPDirective=*/false); + /*StartOfTokenColumn=*/StartColumn, /*IsAligned=*/true, + /*InPPDirective=*/false); } else if (LineIndex > 0) { // In case we're reflowing after the '\' in: // @@ -932,6 +933,7 @@ /*Newlines=*/1, /*Spaces=*/LineColumn, /*StartOfTokenColumn=*/LineColumn, + /*IsAligned=*/true, /*InPPDirective=*/false); } if (OriginalPrefix[LineIndex] != Prefix[LineIndex]) { Index: clang/lib/Format/ContinuationIndenter.h =================================================================== --- clang/lib/Format/ContinuationIndenter.h +++ clang/lib/Format/ContinuationIndenter.h @@ -202,13 +202,14 @@ ParenState(const FormatToken *Tok, unsigned Indent, unsigned LastSpace, bool AvoidBinPacking, bool NoLineBreak) : Tok(Tok), Indent(Indent), LastSpace(LastSpace), - NestedBlockIndent(Indent), BreakBeforeClosingBrace(false), - AvoidBinPacking(AvoidBinPacking), BreakBeforeParameter(false), - NoLineBreak(NoLineBreak), NoLineBreakInOperand(false), - LastOperatorWrapped(true), ContainsLineBreak(false), - ContainsUnwrappedBuilder(false), AlignColons(true), - ObjCSelectorNameFound(false), HasMultipleNestedBlocks(false), - NestedBlockInlined(false), IsInsideObjCArrayLiteral(false) {} + NestedBlockIndent(Indent), IsAligned(false), + BreakBeforeClosingBrace(false), AvoidBinPacking(AvoidBinPacking), + BreakBeforeParameter(false), NoLineBreak(NoLineBreak), + NoLineBreakInOperand(false), LastOperatorWrapped(true), + ContainsLineBreak(false), ContainsUnwrappedBuilder(false), + AlignColons(true), ObjCSelectorNameFound(false), + HasMultipleNestedBlocks(false), NestedBlockInlined(false), + IsInsideObjCArrayLiteral(false) {} /// \brief The token opening this parenthesis level, or nullptr if this level /// is opened by fake parenthesis. @@ -264,6 +265,9 @@ /// Used to align further variables if necessary. unsigned VariablePos = 0; + /// Whether this block's indentation is used for alignment. + bool IsAligned : 1; + /// Whether a newline needs to be inserted before the block's closing /// brace. /// @@ -338,6 +342,8 @@ return NestedBlockIndent < Other.NestedBlockIndent; if (FirstLessLess != Other.FirstLessLess) return FirstLessLess < Other.FirstLessLess; + if (IsAligned != Other.IsAligned) + return IsAligned; if (BreakBeforeClosingBrace != Other.BreakBeforeClosingBrace) return BreakBeforeClosingBrace; if (QuestionColumn != Other.QuestionColumn) Index: clang/lib/Format/ContinuationIndenter.cpp =================================================================== --- clang/lib/Format/ContinuationIndenter.cpp +++ clang/lib/Format/ContinuationIndenter.cpp @@ -635,8 +635,10 @@ if (Style.AlignAfterOpenBracket != FormatStyle::BAS_DontAlign && Previous.opensScope() && Previous.isNot(TT_ObjCMethodExpr) && - (Current.isNot(TT_LineComment) || Previous.BlockKind == BK_BracedInit)) + (Current.isNot(TT_LineComment) || Previous.BlockKind == BK_BracedInit)) { State.Stack.back().Indent = State.Column + Spaces; + State.Stack.back().IsAligned = true; + } if (State.Stack.back().AvoidBinPacking && startsNextParameter(Current, Style)) State.Stack.back().NoLineBreak = true; if (startsSegmentOfBuilderTypeCall(Current) && @@ -849,6 +851,7 @@ bool ContinuePPDirective = State.Line->InPPDirective && State.Line->Type != LT_ImportStatement; Whitespaces.replaceWhitespace(Current, Newlines, State.Column, State.Column, + State.Stack.back().IsAligned, ContinuePPDirective); } Index: clang/lib/Format/UnwrappedLineFormatter.cpp =================================================================== --- clang/lib/Format/UnwrappedLineFormatter.cpp +++ clang/lib/Format/UnwrappedLineFormatter.cpp @@ -818,7 +818,8 @@ if (!DryRun) { Whitespaces->replaceWhitespace( *Child->First, /*Newlines=*/0, /*Spaces=*/1, - /*StartOfTokenColumn=*/State.Column, State.Line->InPPDirective); + /*StartOfTokenColumn=*/State.Column, /*IsAligned=*/false, + State.Line->InPPDirective); } Penalty += formatLine(*Child, State.Column + 1, /*FirstStartColumn=*/0, DryRun); @@ -1250,6 +1251,7 @@ Indent = 0; Whitespaces->replaceWhitespace(RootToken, Newlines, Indent, Indent, + /*IsAligned=*/false, Line.InPPDirective && !RootToken.HasUnescapedNewline); } Index: clang/lib/Format/WhitespaceManager.h =================================================================== --- clang/lib/Format/WhitespaceManager.h +++ clang/lib/Format/WhitespaceManager.h @@ -49,7 +49,7 @@ /// this replacement. It is needed for determining how \p Spaces is turned /// into tabs and spaces for some format styles. void replaceWhitespace(FormatToken &Tok, unsigned Newlines, unsigned Spaces, - unsigned StartOfTokenColumn, + unsigned StartOfTokenColumn, bool isAligned = false, bool InPPDirective = false); /// Adds information about an unchangeable token's whitespace. @@ -109,7 +109,7 @@ SourceRange OriginalWhitespaceRange, int Spaces, unsigned StartOfTokenColumn, unsigned NewlinesBefore, StringRef PreviousLinePostfix, StringRef CurrentLinePrefix, - bool ContinuesPPDirective, bool IsInsideToken); + bool IsAligned, bool ContinuesPPDirective, bool IsInsideToken); // The kind of the token whose whitespace this change replaces, or in which // this change inserts whitespace. @@ -125,6 +125,7 @@ unsigned NewlinesBefore; std::string PreviousLinePostfix; std::string CurrentLinePrefix; + bool IsAligned; bool ContinuesPPDirective; // The number of spaces in front of the token or broken part of the token. @@ -204,7 +205,10 @@ unsigned PreviousEndOfTokenColumn, unsigned EscapedNewlineColumn); void appendIndentText(std::string &Text, unsigned IndentLevel, - unsigned Spaces, unsigned WhitespaceStartColumn); + unsigned Spaces, unsigned WhitespaceStartColumn, + bool IsAligned); + unsigned appendTabIndent(std::string &Text, unsigned Spaces, + unsigned Indentation); SmallVector Changes; const SourceManager &SourceMgr; Index: clang/lib/Format/WhitespaceManager.cpp =================================================================== --- clang/lib/Format/WhitespaceManager.cpp +++ clang/lib/Format/WhitespaceManager.cpp @@ -30,13 +30,13 @@ int Spaces, unsigned StartOfTokenColumn, unsigned NewlinesBefore, StringRef PreviousLinePostfix, - StringRef CurrentLinePrefix, + StringRef CurrentLinePrefix, bool IsAligned, bool ContinuesPPDirective, bool IsInsideToken) : Tok(&Tok), CreateReplacement(CreateReplacement), OriginalWhitespaceRange(OriginalWhitespaceRange), StartOfTokenColumn(StartOfTokenColumn), NewlinesBefore(NewlinesBefore), PreviousLinePostfix(PreviousLinePostfix), - CurrentLinePrefix(CurrentLinePrefix), + CurrentLinePrefix(CurrentLinePrefix), IsAligned(IsAligned), ContinuesPPDirective(ContinuesPPDirective), Spaces(Spaces), IsInsideToken(IsInsideToken), IsTrailingComment(false), TokenLength(0), PreviousEndOfTokenColumn(0), EscapedNewlineColumn(0), @@ -45,13 +45,13 @@ void WhitespaceManager::replaceWhitespace(FormatToken &Tok, unsigned Newlines, unsigned Spaces, unsigned StartOfTokenColumn, - bool InPPDirective) { + bool IsAligned, bool InPPDirective) { if (Tok.Finalized) return; Tok.Decision = (Newlines > 0) ? FD_Break : FD_Continue; Changes.push_back(Change(Tok, /*CreateReplacement=*/true, Tok.WhitespaceRange, Spaces, StartOfTokenColumn, Newlines, "", "", - InPPDirective && !Tok.IsFirst, + IsAligned, InPPDirective && !Tok.IsFirst, /*IsInsideToken=*/false)); } @@ -62,7 +62,7 @@ Changes.push_back(Change(Tok, /*CreateReplacement=*/false, Tok.WhitespaceRange, /*Spaces=*/0, Tok.OriginalColumn, Tok.NewlinesBefore, "", "", - InPPDirective && !Tok.IsFirst, + /*IsAligned=*/false, InPPDirective && !Tok.IsFirst, /*IsInsideToken=*/false)); } @@ -82,7 +82,8 @@ Change(Tok, /*CreateReplacement=*/true, SourceRange(Start, Start.getLocWithOffset(ReplaceChars)), Spaces, std::max(0, Spaces), Newlines, PreviousPostfix, CurrentPrefix, - InPPDirective && !Tok.IsFirst, /*IsInsideToken=*/true)); + /*IsAligned=*/true, InPPDirective && !Tok.IsFirst, + /*IsInsideToken=*/true)); } const tooling::Replacements &WhitespaceManager::generateReplacements() { @@ -761,9 +762,9 @@ C.EscapedNewlineColumn); else appendNewlineText(ReplacementText, C.NewlinesBefore); - appendIndentText(ReplacementText, C.Tok->IndentLevel, - std::max(0, C.Spaces), - C.StartOfTokenColumn - std::max(0, C.Spaces)); + appendIndentText( + ReplacementText, C.Tok->IndentLevel, std::max(0, C.Spaces), + C.StartOfTokenColumn - std::max(0, C.Spaces), C.IsAligned); ReplacementText.append(C.CurrentLinePrefix); storeReplacement(C.OriginalWhitespaceRange, ReplacementText); } @@ -809,7 +810,8 @@ void WhitespaceManager::appendIndentText(std::string &Text, unsigned IndentLevel, unsigned Spaces, - unsigned WhitespaceStartColumn) { + unsigned WhitespaceStartColumn, + bool IsAligned) { switch (Style.UseTab) { case FormatStyle::UT_Never: Text.append(Spaces, ' '); @@ -838,28 +840,34 @@ case FormatStyle::UT_ForIndentation: if (WhitespaceStartColumn == 0) { unsigned Indentation = IndentLevel * Style.IndentWidth; - // This happens, e.g. when a line in a block comment is indented less than - // the first one. - if (Indentation > Spaces) - Indentation = Spaces; - if (Style.TabWidth) { - unsigned Tabs = Indentation / Style.TabWidth; - Text.append(Tabs, '\t'); - Spaces -= Tabs * Style.TabWidth; - } + Spaces = appendTabIndent(Text, Spaces, Indentation); } Text.append(Spaces, ' '); break; case FormatStyle::UT_ForContinuationAndIndentation: - if (WhitespaceStartColumn == 0 && Style.TabWidth) { - unsigned Tabs = Spaces / Style.TabWidth; - Text.append(Tabs, '\t'); - Spaces -= Tabs * Style.TabWidth; + if (WhitespaceStartColumn == 0) { + unsigned Indentation = + IsAligned ? IndentLevel * Style.IndentWidth : Spaces; + Spaces = appendTabIndent(Text, Spaces, Indentation); } Text.append(Spaces, ' '); break; } } +unsigned WhitespaceManager::appendTabIndent(std::string &Text, unsigned Spaces, + unsigned Indentation) { + // This happens, e.g. when a line in a block comment is indented less than the + // first one. + if (Indentation > Spaces) + Indentation = Spaces; + if (Style.TabWidth) { + unsigned Tabs = Indentation / Style.TabWidth; + Text.append(Tabs, '\t'); + Spaces -= Tabs * Style.TabWidth; + } + return Spaces; +} + } // namespace format } // namespace clang Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -10139,7 +10139,7 @@ verifyFormat("class X {\n" "\tvoid f() {\n" "\t\tsomeFunction(parameter1,\n" - "\t\t\t parameter2);\n" + "\t\t parameter2);\n" "\t}\n" "};", Tab); @@ -10155,7 +10155,7 @@ verifyFormat("class TabWidth4Indent8 {\n" "\t\tvoid f() {\n" "\t\t\t\tsomeFunction(parameter1,\n" - "\t\t\t\t\t\t\t parameter2);\n" + "\t\t\t\t parameter2);\n" "\t\t}\n" "};", Tab); @@ -10164,7 +10164,7 @@ verifyFormat("class TabWidth4Indent4 {\n" "\tvoid f() {\n" "\t\tsomeFunction(parameter1,\n" - "\t\t\t\t\t parameter2);\n" + "\t\t parameter2);\n" "\t}\n" "};", Tab); @@ -10173,15 +10173,15 @@ verifyFormat("class TabWidth8Indent4 {\n" " void f() {\n" "\tsomeFunction(parameter1,\n" - "\t\t parameter2);\n" + "\t parameter2);\n" " }\n" "};", Tab); Tab.TabWidth = 8; Tab.IndentWidth = 8; EXPECT_EQ("/*\n" - "\t a\t\tcomment\n" - "\t in multiple lines\n" + " a\t\tcomment\n" + " in multiple lines\n" " */", format(" /*\t \t \n" " \t \t a\t\tcomment\t \t\n" @@ -10213,7 +10213,7 @@ verifyFormat("class X {\n" "\tvoid f() {\n" "\t\tsomeFunction(parameter1,\n" - "\t\t\t parameter2);\n" + "\t\t parameter2);\n" "\t}\n" "};", Tab); @@ -10222,7 +10222,7 @@ "\t {\n" "\t\t int a;\n" "\t\t someFunction(aaaaaaaa,\n" - "\t\t\t\t bbbbbbb);\n" + "\t\t bbbbbbb);\n" "\t },\n" "\t p);\n" "}", @@ -10290,15 +10290,6 @@ "\t*/\n" "}", Tab)); - EXPECT_EQ("/*\n" - "\t a\t\tcomment\n" - "\t in multiple lines\n" - " */", - format(" /*\t \t \n" - " \t \t a\t\tcomment\t \t\n" - " \t \t in multiple lines\t\n" - " \t */", - Tab)); EXPECT_EQ("/* some\n" " comment */", format(" \t \t /* some\n" @@ -10331,6 +10322,29 @@ "\t */\n" "\t int i;\n" "}")); + Tab.TabWidth = 2; + Tab.IndentWidth = 2; + EXPECT_EQ("{\n" + "\t/* aaaa\n" + "\t bbbb */\n" + "}", + format("{\n" + "/* aaaa\n" + " bbbb */\n" + "}", + Tab)); + EXPECT_EQ("{\n" + "\t/*\n" + "\t aaaaaaaaaaaaaaaaaaaaaaaaaa\n" + "\t bbbbbbbbbbbbb\n" + "\t*/\n" + "}", + format("{\n" + "/*\n" + " aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n" + "*/\n" + "}", + Tab)); Tab.AlignConsecutiveAssignments = true; Tab.AlignConsecutiveDeclarations = true; Tab.TabWidth = 4;