Skip to content

Commit ebb6d85

Browse files
committed
Address comments
1 parent 61cb485 commit ebb6d85

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

clang/unittests/Format/FormatTestObjC.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,12 +763,15 @@ TEST_F(FormatTestObjC, FormatObjCMethodExpr) {
763763
" backing:NSBackingStoreBuffered\n"
764764
" defer:NO]);\n"
765765
"}");
766-
verifyFormat(R"(- (void)test {
767-
if ([object
768-
respondsToSelector:@selector(
769-
selectorNameThatIsReallyLong:param1:param2:)])
770-
return;
771-
})");
766+
Style.ColumnLimit = 63;
767+
verifyFormat(
768+
"- (void)test {\n"
769+
" if ([object\n"
770+
" respondsToSelector:@selector(\n"
771+
" selectorName:param1:param2:)])\n"
772+
" return;\n"
773+
"}");
774+
Style.ColumnLimit = PreviousColumnLimit;
772775
verifyFormat("[contentsContainer replaceSubview:[subviews objectAtIndex:0]\n"
773776
" with:contentsNativeView];");
774777

clang/unittests/Format/TokenAnnotatorTest.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,11 +1929,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsObjCMethodExpr) {
19291929
ASSERT_EQ(Tokens.size(), 20u) << Tokens;
19301930
EXPECT_TOKEN(Tokens[9], tok::l_square, TT_ObjCMethodExpr);
19311931
EXPECT_TOKEN(Tokens[15], tok::greater, TT_BinaryOperator);
1932+
19321933
Tokens = annotate("a = @selector(name:);");
19331934
ASSERT_EQ(Tokens.size(), 10u) << Tokens;
19341935
EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_ObjCSelector);
19351936
EXPECT_TOKEN(Tokens[6], tok::colon, TT_ObjCSelector);
19361937
EXPECT_TOKEN(Tokens[7], tok::r_paren, TT_ObjCSelector);
1938+
19371939
Tokens =
19381940
annotate("[object respondsToSelector:@selector(name:param1:param2:)\n"
19391941
" respondsToSelector:@selector(name:param1:param2:)];");
@@ -1952,6 +1954,7 @@ TEST_F(TokenAnnotatorTest, UnderstandsObjCMethodExpr) {
19521954
EXPECT_TOKEN(Tokens[24], tok::colon, TT_ObjCSelector);
19531955
EXPECT_TOKEN(Tokens[25], tok::r_paren, TT_ObjCSelector);
19541956
EXPECT_TOKEN(Tokens[26], tok::r_square, TT_ObjCMethodExpr);
1957+
19551958
Tokens = annotate("[a b:c];");
19561959
ASSERT_EQ(Tokens.size(), 8u) << Tokens;
19571960
EXPECT_TOKEN(Tokens[0], tok::l_square, TT_ObjCMethodExpr);

0 commit comments

Comments
 (0)