From: Nico Weber <nicolasweber@gmx.de>
Date: Fri, 21 Dec 2012 18:21:56 +0000 (+0000)
Subject: format: Handle #import as include directive too.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b23ae0c5104a4fec4c2ff603143fe142ec409249;p=clang

format: Handle #import as include directive too.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170914 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index b5e4a7003d..bb18e9a851 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -579,6 +579,7 @@ public:
         return;
       switch (Tokens[Index].Tok.getIdentifierInfo()->getPPKeywordID()) {
       case tok::pp_include:
+      case tok::pp_import:
         parseIncludeDirective();
         break;
       default:
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index a08f7c6cf7..b33206b404 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -617,6 +617,12 @@ TEST_F(FormatTest, HandlesIncludeDirectives) {
   EXPECT_EQ("#include \"a/b/string\"\n", format("#include \"a/b/string\"\n"));
   EXPECT_EQ("#include \"string.h\"\n", format("#include \"string.h\"\n"));
   EXPECT_EQ("#include \"string.h\"\n", format("#include \"string.h\"\n"));
+
+  EXPECT_EQ("#import <string>\n", format("#import <string>\n"));
+  EXPECT_EQ("#import <a/b/c.h>\n", format("#import <a/b/c.h>\n"));
+  EXPECT_EQ("#import \"a/b/string\"\n", format("#import \"a/b/string\"\n"));
+  EXPECT_EQ("#import \"string.h\"\n", format("#import \"string.h\"\n"));
+  EXPECT_EQ("#import \"string.h\"\n", format("#import \"string.h\"\n"));
 }