Author: djasper
Date: Mon Jun 20 15:39:53 2016
New Revision: 273196
URL: http://llvm.org/viewvc/llvm-project?rev=273196&view=rev
Log:
clang-format: [Proto] Fix "import public" after r273179.
Modified:
cfe/trunk/lib/Format/UnwrappedLineParser.cpp
cfe/trunk/unittests/Format/FormatTestProto.cpp
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=273196&r1=273195&r2=273196&view=diff
==============================================================================
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Mon Jun 20 15:39:53 2016
@@ -889,6 +889,8 @@ void UnwrappedLineParser::parseStructura
}
if (Style.Language == FormatStyle::LK_Proto) {
nextToken();
+ if (FormatTok->is(tok::kw_public))
+ nextToken();
if (!FormatTok->is(tok::string_literal))
return;
nextToken();
Modified: cfe/trunk/unittests/Format/FormatTestProto.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestProto.cpp?rev=273196&r1=273195&r2=273196&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTestProto.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTestProto.cpp Mon Jun 20 15:39:53 2016
@@ -196,6 +196,12 @@ TEST_F(FormatTestProto, FormatsImports)
"message A {\n"
"}");
+ verifyFormat("import public \"a.proto\";\n"
+ "import \"b.proto\";\n"
+ "// comment\n"
+ "message A {\n"
+ "}");
+
// Missing semicolons should not confuse clang-format.
verifyFormat("import \"a.proto\"\n"
"import \"b.proto\"\n"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
