From 049c44767370b7257d17a5c32d407f19efa01c6f Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 9 Jan 2013 21:42:32 +0000 Subject: [PATCH] Formatter: Make parseObjCUntilAtEnd() actually work. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172003 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/UnwrappedLineParser.cpp | 2 ++ unittests/Format/FormatTest.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp index 688937c1e6..1d0cb30af8 100644 --- a/lib/Format/UnwrappedLineParser.cpp +++ b/lib/Format/UnwrappedLineParser.cpp @@ -212,6 +212,8 @@ void UnwrappedLineParser::parseStructuralElement() { return parseObjCInterface(); case tok::objc_protocol: return parseObjCProtocol(); + case tok::objc_end: + return; // Handled by the caller. default: break; } diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index e06544a95f..15fe9aa9d7 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1189,6 +1189,8 @@ TEST_F(FormatTest, FormatObjCInterface) { "@end"); verifyFormat("@interface Foo\n" + "@end\n" + "@interface Bar\n" "@end"); verifyFormat("@interface Foo : Bar\n" @@ -1262,6 +1264,11 @@ TEST_F(FormatTest, FormatObjCProtocol) { verifyFormat("@protocol Foo;\n" "@protocol Bar;\n"); + + verifyFormat("@protocol Foo\n" + "@end\n" + "@protocol Bar\n" + "@end"); } TEST_F(FormatTest, ObjCAt) { -- 2.40.0