Don't break string literals inside preprocessor directives.
Summary: This way we avoid breaking code which uses unknown preprocessor directives with long string literals. The specific use case in http://llvm.org/PR17035 isn't very common, but it seems to be a good idea to avoid this kind of problem anyway. Reviewers: djasper Reviewed By: djasper CC: cfe-commits, klimek Differential Revision: http://llvm-reviews.chandlerc.com/D1813 llvm-svn: 192507
This commit is contained in:
parent
11dd4b1b56
commit
384b40b90d
|
@ -696,6 +696,13 @@ unsigned ContinuationIndenter::breakProtrudingToken(const FormatToken &Current,
|
|||
tok::utf8_string_literal, tok::utf16_string_literal,
|
||||
tok::utf32_string_literal) &&
|
||||
Current.Type != TT_ImplicitStringLiteral) {
|
||||
// Don't break string literals inside preprocessor directives (except for
|
||||
// #define directives, as their contents are stored in separate lines and
|
||||
// are not affected by this check).
|
||||
// This way we avoid breaking code with line directives and unknown
|
||||
// preprocessor directives that contain long string literals.
|
||||
if (State.Line->Type == LT_PreprocessorDirective)
|
||||
return 0;
|
||||
// Exempts unterminated string literals from line breaking. The user will
|
||||
// likely want to terminate the string before any line breaking is done.
|
||||
if (Current.IsUnterminatedLiteral)
|
||||
|
|
|
@ -464,6 +464,10 @@ private:
|
|||
next();
|
||||
if (CurrentToken == NULL)
|
||||
return;
|
||||
if (CurrentToken->Tok.is(tok::numeric_constant)) {
|
||||
CurrentToken->SpacesRequiredBefore = 1;
|
||||
return;
|
||||
}
|
||||
// Hashes in the middle of a line can lead to any strange token
|
||||
// sequence.
|
||||
if (CurrentToken->Tok.getIdentifierInfo() == NULL)
|
||||
|
@ -1051,9 +1055,9 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) {
|
|||
while (Current != NULL) {
|
||||
if (Current->Type == TT_LineComment)
|
||||
Current->SpacesRequiredBefore = Style.SpacesBeforeTrailingComments;
|
||||
else
|
||||
Current->SpacesRequiredBefore =
|
||||
spaceRequiredBefore(Line, *Current) ? 1 : 0;
|
||||
else if (Current->SpacesRequiredBefore == 0 &&
|
||||
spaceRequiredBefore(Line, *Current))
|
||||
Current->SpacesRequiredBefore = 1;
|
||||
|
||||
Current->MustBreakBefore =
|
||||
Current->MustBreakBefore || mustBreakBefore(Line, *Current);
|
||||
|
|
|
@ -1873,14 +1873,28 @@ TEST_F(FormatTest, FormatsSmallMacroDefinitionsInSingleLine) {
|
|||
}
|
||||
|
||||
TEST_F(FormatTest, DoesNotBreakPureVirtualFunctionDefinition) {
|
||||
verifyFormat(
|
||||
"virtual void write(ELFWriter *writerrr,\n"
|
||||
" OwningPtr<FileOutputBuffer> &buffer) = 0;");
|
||||
verifyFormat("virtual void write(ELFWriter *writerrr,\n"
|
||||
" OwningPtr<FileOutputBuffer> &buffer) = 0;");
|
||||
}
|
||||
|
||||
TEST_F(FormatTest, BreaksStringLiteralsOnlyInDefine) {
|
||||
verifyFormat("# 1111 \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\" 2 3",
|
||||
getLLVMStyleWithColumns(40));
|
||||
verifyFormat("#line 11111 \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\"",
|
||||
getLLVMStyleWithColumns(40));
|
||||
EXPECT_EQ("#define Q \\\n"
|
||||
" \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/\" \\\n"
|
||||
" \"aaaaaaaa.cpp\"",
|
||||
format("#define Q \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\"",
|
||||
getLLVMStyleWithColumns(40)));
|
||||
}
|
||||
|
||||
TEST_F(FormatTest, UnderstandsLinePPDirective) {
|
||||
EXPECT_EQ("# 123 \"A string literal\"",
|
||||
format(" # 123 \"A string literal\""));
|
||||
}
|
||||
|
||||
TEST_F(FormatTest, LayoutUnknownPPDirective) {
|
||||
EXPECT_EQ("#123 \"A string literal\"",
|
||||
format(" # 123 \"A string literal\""));
|
||||
EXPECT_EQ("#;", format("#;"));
|
||||
verifyFormat("#\n;\n;\n;");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue