From 47ef6ddece6eee55f3d53e07f484832cece770f9 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Fri, 17 Jan 2014 16:21:39 +0000 Subject: [PATCH] clang-format: Don't break lines starting with "import " The author might be missing the "#" or these might be protocol buffer definitions. Either way, we should not break the line or the string. There don't seem to be other valid use cases. llvm-svn: 199501 --- clang/lib/Format/TokenAnnotator.cpp | 9 +++++++++ clang/unittests/Format/FormatTest.cpp | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index b04ccd0ba752..d80e55049490 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -529,6 +529,15 @@ public: parsePreprocessorDirective(); return LT_PreprocessorDirective; } + + // Directly allow to 'import ' to support protocol buffer + // definitions (code.google.com/p/protobuf) or missing "#" (either way we + // should not break the line). + IdentifierInfo *Info = CurrentToken->Tok.getIdentifierInfo(); + if (Info && Info->getPPKeywordID() == tok::pp_import && + CurrentToken->Next && CurrentToken->Next->is(tok::string_literal)) + parseIncludeDirective(); + while (CurrentToken != NULL) { if (CurrentToken->is(tok::kw_virtual)) KeywordVirtualFound = true; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index c75df9ce151e..0fade5b42f04 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -4657,6 +4657,10 @@ TEST_F(FormatTest, HandlesIncludeDirectives) { verifyFormat("#if __has_include()\n" "#include \n" "#endif"); + + // Protocol buffer definition or missing "#". + verifyFormat("import \"aaaaaaaaaaaaaaaaa/aaaaaaaaaaaaaaa\";", + getLLVMStyleWithColumns(30)); } //===----------------------------------------------------------------------===//