maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] Refine ObjC guesser to handle child lines of child lines 

Summary:
This fixes an issue brought up by djasper@ in his review of D44790. We
handled top-level child lines, but if those child lines themselves
had child lines, we didn't handle them.

Rather than use recursion (which could blow out the stack), I use a
DenseSet to hold the set of lines we haven't yet checked (since order
doesn't matter), and update the set to add the children of each
line as we check it.

Test Plan: New tests added. Confirmed tests failed before fix
  and passed after fix.

Reviewers: djasper

Reviewed By: djasper

Subscribers: klimek, cfe-commits

Differential Revision: https://reviews.llvm.org/D44831

llvm-svn: 328628
This commit is contained in:
Ben Hamilton 2018-03-27 15:01:21 +00:00
parent d54e7aa9e2
commit ea7a27b847
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang/lib/Format/Format.cpp
View File

@ -1514,8 +1514,8 @@ private:
"UIView",
};
auto LineContainsObjCCode = [&Keywords](const AnnotatedLine &Line) {
for (const FormatToken *FormatTok = Line.First; FormatTok;
for (auto Line : AnnotatedLines) {
for (const FormatToken *FormatTok = Line->First; FormatTok;
FormatTok = FormatTok->Next) {
if ((FormatTok->Previous && FormatTok->Previous->is(tok::at) &&
(FormatTok->isObjCAtKeyword(tok::objc_interface) ||
@ -1535,14 +1535,7 @@ private:
TT_ObjCMethodSpecifier, TT_ObjCProperty)) {
return true;
}
}
return false;
};
for (auto Line : AnnotatedLines) {
if (LineContainsObjCCode(*Line))
return true;
for (auto ChildLine : Line->Children) {
if (LineContainsObjCCode(*ChildLine))
if (guessIsObjC(Line->Children, Keywords))
return true;
}
}

6
clang/unittests/Format/FormatTest.cpp
View File

@ -12159,6 +12159,12 @@ TEST_F(FormatTest, GuessLanguageWithChildLines) {
guessLanguage("foo.h", "#define FOO ({ std::string s; })"));
EXPECT_EQ(FormatStyle::LK_ObjC,
guessLanguage("foo.h", "#define FOO ({ NSString *s; })"));
EXPECT_EQ(
FormatStyle::LK_Cpp,
guessLanguage("foo.h", "#define FOO ({ foo(); ({ std::string s; }) })"));
EXPECT_EQ(
FormatStyle::LK_ObjC,
guessLanguage("foo.h", "#define FOO ({ foo(); ({ NSString *s; }) })"));
}
} // end namespace