benhamilton created this revision. benhamilton added reviewers: djasper, jolesiak. Herald added subscribers: cfe-commits, klimek.
In https://reviews.llvm.org/D45185, I added clang-format parser support for Objective-C generics. However, I didn't touch the whitespace logic, so they got the same space logic as Objective-C protocol lists. In every example in the Apple SDK and in the documentation, there is no space between the class name and the opening `<` for the lightweight generic specification, so this diff removes the space and updates the tests. Test Plan: Tests updated. Ran tests with: % make -j16 FormatTests && ./tools/clang/unittests/Format/FormatTests Repository: rC Clang https://reviews.llvm.org/D45498 Files: lib/Format/TokenAnnotator.cpp unittests/Format/FormatTestObjC.cpp Index: unittests/Format/FormatTestObjC.cpp =================================================================== --- unittests/Format/FormatTestObjC.cpp +++ unittests/Format/FormatTestObjC.cpp @@ -299,13 +299,13 @@ "+ (id)init;\n" "@end"); - verifyFormat("@interface Foo <Baz : Blech> : Bar <Baz, Quux> {\n" + verifyFormat("@interface Foo<Baz : Blech> : Bar <Baz, Quux> {\n" " int _i;\n" "}\n" "+ (id)init;\n" "@end"); - verifyFormat("@interface Foo <Bar : Baz <Blech>> : Xyzzy <Corge> {\n" + verifyFormat("@interface Foo<Bar : Baz <Blech>> : Xyzzy <Corge> {\n" " int _i;\n" "}\n" "+ (id)init;\n" Index: lib/Format/TokenAnnotator.cpp =================================================================== --- lib/Format/TokenAnnotator.cpp +++ lib/Format/TokenAnnotator.cpp @@ -2349,9 +2349,15 @@ : Style.SpacesInParentheses; if (Right.isOneOf(tok::semi, tok::comma)) return false; - if (Right.is(tok::less) && Line.Type == LT_ObjCDecl && - Style.ObjCSpaceBeforeProtocolList) - return true; + if (Right.is(tok::less) && Line.Type == LT_ObjCDecl) { + if (Right.MatchingParen && Right.MatchingParen->Next && + Right.MatchingParen->Next->is(tok::colon)) + // Lightweight generic -> no space. @interface Foo<KeyType> : Bar <Baz> + return false; + else + // Protocol list -> space if configured. @interface Foo : Bar <Baz> + return Style.ObjCSpaceBeforeProtocolList; + } if (Right.is(tok::less) && Left.is(tok::kw_template)) return Style.SpaceAfterTemplateKeyword; if (Left.isOneOf(tok::exclaim, tok::tilde))
Index: unittests/Format/FormatTestObjC.cpp =================================================================== --- unittests/Format/FormatTestObjC.cpp +++ unittests/Format/FormatTestObjC.cpp @@ -299,13 +299,13 @@ "+ (id)init;\n" "@end"); - verifyFormat("@interface Foo <Baz : Blech> : Bar <Baz, Quux> {\n" + verifyFormat("@interface Foo<Baz : Blech> : Bar <Baz, Quux> {\n" " int _i;\n" "}\n" "+ (id)init;\n" "@end"); - verifyFormat("@interface Foo <Bar : Baz <Blech>> : Xyzzy <Corge> {\n" + verifyFormat("@interface Foo<Bar : Baz <Blech>> : Xyzzy <Corge> {\n" " int _i;\n" "}\n" "+ (id)init;\n" Index: lib/Format/TokenAnnotator.cpp =================================================================== --- lib/Format/TokenAnnotator.cpp +++ lib/Format/TokenAnnotator.cpp @@ -2349,9 +2349,15 @@ : Style.SpacesInParentheses; if (Right.isOneOf(tok::semi, tok::comma)) return false; - if (Right.is(tok::less) && Line.Type == LT_ObjCDecl && - Style.ObjCSpaceBeforeProtocolList) - return true; + if (Right.is(tok::less) && Line.Type == LT_ObjCDecl) { + if (Right.MatchingParen && Right.MatchingParen->Next && + Right.MatchingParen->Next->is(tok::colon)) + // Lightweight generic -> no space. @interface Foo<KeyType> : Bar <Baz> + return false; + else + // Protocol list -> space if configured. @interface Foo : Bar <Baz> + return Style.ObjCSpaceBeforeProtocolList; + } if (Right.is(tok::less) && Left.is(tok::kw_template)) return Style.SpaceAfterTemplateKeyword; if (Left.isOneOf(tok::exclaim, tok::tilde))
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits